From: Stephen Rothwell <sfr@canb.auug.org.au>
To: James Morris <jmorris@namei.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Jiri Bohac <jbohac@suse.cz>, David Howells <dhowells@redhat.com>,
Matthew Garrett <mjg59@google.com>,
Nayna Jain <nayna@linux.ibm.com>,
Mimi Zohar <zohar@linux.ibm.com>
Subject: linux-next: manual merge of the security tree with Linus' tree
Date: Wed, 21 Aug 2019 13:05:13 +1000 [thread overview]
Message-ID: <20190821130513.0038df28@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1440 bytes --]
Hi all,
Today's linux-next merge of the security tree got a conflict in:
security/integrity/ima/Kconfig
between commit:
9e1e5d4372d6 ("x86/ima: fix the Kconfig dependency for IMA_ARCH_POLICY")
from Linus' tree and commit:
99d5cadfde2b ("kexec_file: split KEXEC_VERIFY_SIG into KEXEC_SIG and KEXEC_SIG_FORCE")
from the security tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc security/integrity/ima/Kconfig
index 2ced99dde694,32cd25fa44a5..000000000000
--- a/security/integrity/ima/Kconfig
+++ b/security/integrity/ima/Kconfig
@@@ -160,8 -160,7 +160,8 @@@ config IMA_APPRAIS
config IMA_ARCH_POLICY
bool "Enable loading an IMA architecture specific policy"
- depends on (KEXEC_VERIFY_SIG && IMA) || IMA_APPRAISE \
- depends on KEXEC_SIG || IMA_APPRAISE && INTEGRITY_ASYMMETRIC_KEYS
++ depends on (KEXEC_SIG && IMA) || IMA_APPRAISE \
+ && INTEGRITY_ASYMMETRIC_KEYS
default n
help
This option enables loading an IMA architecture specific policy
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-08-21 3:05 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-21 3:05 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:01 Stephen Rothwell
2019-08-21 3:18 ` Stephen Rothwell
2019-08-12 4:48 Stephen Rothwell
2015-08-04 1:14 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=20190821130513.0038df28@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dhowells@redhat.com \
--cc=jbohac@suse.cz \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mjg59@google.com \
--cc=nayna@linux.ibm.com \
--cc=zohar@linux.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.