GitLab

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

arm allnoconfig:

mm/oom_kill.c:60:25: warning: 'vm_oom_kill_table' defined but not used [-Wunused-variable]
   60 | static struct ctl_table vm_oom_kill_table[] = {
      |                         ^~~~~~~~~~~~~~~~~

Cc: Luis Chamberlain <mcgrof@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

# Conflicts:
#	include/linux/ptrace.h

# Conflicts:
#	arch/x86/mm/Makefile
#	fs/nfs/file.c
#	include/linux/slab.h
#	mm/page_io.c

# Conflicts:
#	drivers/misc/lkdtm/stackleak.c

# Conflicts:
#	kernel/rcu/rcu.h
#	kernel/trace/ftrace.c

# Conflicts:
#	Makefile
#	include/uapi/linux/android/binder.h

# Conflicts:
#	drivers/virt/Kconfig
#	drivers/virt/Makefile

# Conflicts:
#	drivers/thunderbolt/test.c
#	net/mctp/test/route-test.c
#	security/apparmor/policy_unpack_test.c

# Conflicts:
#	MAINTAINERS

Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git

# Conflicts:
#	arch/h8300/kernel/process.c
#	arch/x86/kernel/process.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git

# Conflicts:
#	Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt