From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Mimi Zohar <zohar@linux•vnet.ibm.com>,
Dmitry Kasatkin <dmitry.kasatkin@gmail•com>
Cc: Borislav Petkov <bp@suse•de>, Coiby Xu <coxu@redhat•com>,
"Jason A. Donenfeld" <Jason@zx2c4•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the tip tree with the integrity tree
Date: Tue, 19 Jul 2022 14:09:50 +1000 [thread overview]
Message-ID: <20220719140950.67296570@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2022-07-19 4:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-19 4:09 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-03-13 4:52 linux-next: manual merge of the tip tree with the integrity tree 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=20220719140950.67296570@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Jason@zx2c4$(echo .)com \
--cc=bp@suse$(echo .)de \
--cc=coxu@redhat$(echo .)com \
--cc=dmitry.kasatkin@gmail$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=zohar@linux$(echo .)vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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