Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
kernel/sysctl.c between commit 404015308747 ("security: trim security.h")
from the security tree and commit "sysctl: use bitmap library functions"
from the akpm.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc kernel/sysctl.c
index 62538ee,cfeb1fa..0000000
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -58,7 -58,7 +58,8 @@@
#include <linux/oom.h>
#include <linux/kmod.h>
#include <linux/capability.h>
+#include <linux/binfmts.h>
+ #include <linux/bitmap.h>
#include <asm/uaccess.h>
#include <asm/processor.h>
Attachment:
pgpCBjP84o_iX.pgp
Description: PGP signature
