From: Stephen Rothwell <sfr@canb.auug.org.au>
To: James Morris <jmorris@namei.org>, Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Dmitry Kasatkin <d.kasatkin@samsung.com>,
Mimi Zohar <zohar@linux.vnet.ibm.com>
Subject: linux-next: manual merge of the security tree with the vfs tree
Date: Wed, 10 Dec 2014 13:47:37 +1100 [thread overview]
Message-ID: <20141210134737.1b51fe92@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 823 bytes --]
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-12-10 2:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-10 2:47 Stephen Rothwell [this message]
2015-05-13 4:26 linux-next: manual merge of the security tree with the vfs tree Stephen Rothwell
2015-05-13 4:39 Stephen Rothwell
2015-12-31 4:24 Stephen Rothwell
2015-12-31 4:30 ` Al Viro
2015-12-31 10:45 ` Petko Manolov
2016-01-01 4:34 ` Al Viro
2016-01-01 17:29 ` Petko Manolov
2016-01-04 1:37 ` Mimi Zohar
2016-01-04 1:55 ` Stephen Rothwell
2019-08-12 4:44 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141210134737.1b51fe92@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=d.kasatkin@samsung.com \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
--cc=zohar@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).