* linux-next: manual merge of the tip tree with the integrity tree
@ 2020-03-13 4:52 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2020-03-13 4:52 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Mimi Zohar, Dmitry Kasatkin
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Nayna Jain,
Marco Elver, Paul E. McKenney
[-- Attachment #1: Type: text/plain, Size: 1131 bytes --]
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the tip tree with the integrity tree
@ 2022-07-19 4:09 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2022-07-19 4:09 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Mimi Zohar, Dmitry Kasatkin
Cc: Borislav Petkov, Coiby Xu, Jason A. Donenfeld,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1153 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/kernel/kexec-bzimage64.c
between commit:
c903dae8941d ("kexec, KEYS: make the code in bzImage64_verify_sig generic")
from the integrity tree and commit:
68b8e9713c8e ("x86/setup: Use rng seeds from setup_data")
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/kernel/kexec-bzimage64.c
index f299b48f9c9f,b9bdb40364a6..000000000000
--- a/arch/x86/kernel/kexec-bzimage64.c
+++ b/arch/x86/kernel/kexec-bzimage64.c
@@@ -17,6 -17,8 +17,7 @@@
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/efi.h>
-#include <linux/verification.h>
+ #include <linux/random.h>
#include <asm/bootparam.h>
#include <asm/setup.h>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-19 4:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-13 4:52 linux-next: manual merge of the tip tree with the integrity tree Stephen Rothwell
2022-07-19 4:09 Stephen Rothwell
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).