Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/Kconfig
between commit:
9e2b4be377f0 ("ima: add a new CONFIG for loading arch-specific policies")
from the integrity tree and commit:
40d04110f879 ("x86, kcsan: Enable KCSAN for x86")
from the tip 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 arch/x86/Kconfig
index c4315d8c5edf,61c628e2662f..000000000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -230,7 -229,7 +229,8 @@@ config X8
select VIRT_TO_BUS
select X86_FEATURE_NAMES if PROC_FS
select PROC_PID_ARCH_STATUS if PROC_FS
+ select HAVE_ARCH_KCSAN if X86_64
+ imply IMA_SECURE_AND_OR_TRUSTED_BOOT if EFI
config INSTRUCTION_DECODER
def_bool y
Attachment:
pgpviepWIheMl.pgp
Description: OpenPGP digital signature
