Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in ipc/msgutil.c
between commit b3ecda5869da ("proc: Split the namespace stuff out into
linux/proc_ns.h") from the vfs tree and commit "ipc/msgutil.c: use
linux/uaccess.h" from the akpm tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell s...@canb.auug.org.au diff --cc ipc/msgutil.c index a53f38f,d43439e..0000000 --- a/ipc/msgutil.c +++ b/ipc/msgutil.c @@@ -16,8 -16,8 +16,8 @@@ #include <linux/msg.h> #include <linux/ipc_namespace.h> #include <linux/utsname.h> -#include <linux/proc_fs.h> +#include <linux/proc_ns.h> - #include <asm/uaccess.h> + #include <linux/uaccess.h> #include "util.h"
pgpyMR8XrOo9d.pgp
Description: PGP signature
