linux-next: manual merge of the security tree with the vfs tree

From: Stephen Rothwell
Date: Tue Dec 09 2014 - 21:47:52 EST

Hi James,

Today's linux-next merge of the security tree got a conflict in
init/main.c between commit 87fb64a6c1f7 ("take the targets
of /proc/*/ns/* symlinks to separate fs") from the vfs tree and commit
c9cd2ce2bc63 ("integrity: provide a hook to load keys when rootfs is
ready") from the security tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc init/main.c
index 40240c8e31e8,9fc795fe4b3b..000000000000
--- a/init/main.c
+++ b/init/main.c
@@@ -78,7 -78,7 +78,8 @@@
#include <linux/context_tracking.h>
#include <linux/random.h>
#include <linux/list.h>
+#include <linux/proc_ns.h>
+ #include <linux/integrity.h>

#include <asm/io.h>
#include <asm/bugs.h>

Attachment: pgpAKWYjIkdX_.pgp
Description: OpenPGP digital signature