From: Stephen Rothwell <sfr@canb.auug.org.au>
To: James Morris <jmorris@namei.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Salvatore Mesoraca <s.mesoraca16@gmail.com>,
Kees Cook <keescook@chromium.org>
Subject: linux-next: manual merge of the security tree with Linus' tree
Date: Tue, 4 Aug 2015 11:14:06 +1000 [thread overview]
Message-ID: <20150804111406.1ec4ac3b@canb.auug.org.au> (raw)
Hi James,
Today's linux-next merge of the security tree got a conflict in:
security/yama/yama_lsm.c
between commit:
5413fcdbe9e7 ("Adding YAMA hooks also when YAMA is not stacked.")
from Linus' tree and commit:
730daa164e7c ("Yama: remove needless CONFIG_SECURITY_YAMA_STACKED")
from the security tree.
I fixed it up (the latter removed the code updated by the former, so I
just did that) and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
next reply other threads:[~2015-08-04 1:14 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-04 1:14 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-11-21 3:20 linux-next: manual merge of the security tree with Linus' tree Stephen Rothwell
2022-11-21 18:47 ` Paul Moore
2022-11-21 21:55 ` Stephen Rothwell
2022-11-21 23:09 ` Paul Moore
2022-09-01 2:27 Stephen Rothwell
2022-09-01 13:56 ` Paul Moore
2019-08-21 3:09 Stephen Rothwell
2019-08-21 3:05 Stephen Rothwell
2019-08-21 3:01 Stephen Rothwell
2019-08-21 3:18 ` Stephen Rothwell
2019-08-12 4:48 Stephen Rothwell
2013-02-04 3:06 Stephen Rothwell
2013-01-21 2:12 Stephen Rothwell
2013-01-21 3:10 ` Mimi Zohar
2013-01-21 4:30 ` Stephen Rothwell
2012-10-17 0:41 Stephen Rothwell
2012-10-17 0:52 ` Stephen Rothwell
2012-10-17 0:41 Stephen Rothwell
2012-10-17 0:41 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=20150804111406.1ec4ac3b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=jmorris@namei.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=s.mesoraca16@gmail.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).