linux-next: manual merge of the sysctl tree with the tip tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1097 bytes --]

Hi all,

Today's linux-next merge of the sysctl tree got a conflict in:

  kernel/sysctl.c

between commit:

  8aeacf257070 ("perf/core: Move perf_event sysctls into kernel/events")

from the tip tree and commit:

  dccf3c99febf ("sysctl: remove unneeded include")

from the sysctl tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc kernel/sysctl.c
index 635f5e829fe8,eeb4cba12190..000000000000
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -54,7 -47,7 +47,6 @@@
  #include <linux/acpi.h>
  #include <linux/reboot.h>
  #include <linux/ftrace.h>
- #include <linux/oom.h>
 -#include <linux/perf_event.h>
  #include <linux/kmod.h>
  #include <linux/capability.h>
  #include <linux/binfmts.h>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]