From: Borislav Petkov <bp@suse•de>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Theodore Ts'o <tytso@mit•edu>,
"Jason A. Donenfeld" <Jason@zx2c4•com>,
Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Jonathan McDowell <noodles@fb•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the random tree with the tip tree
Date: Fri, 8 Jul 2022 10:13:03 +0200 [thread overview]
Message-ID: <YsfnDyOaKXA3iIj4@zn.tnic> (raw)
In-Reply-To: <20220708171030.135b12cd@canb.auug.org.au>
On Fri, Jul 08, 2022 at 05:10:30PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the random tree got conflicts in:
>
> arch/x86/include/uapi/asm/bootparam.h
> arch/x86/kernel/kexec-bzimage64.c
> arch/x86/kernel/setup.c
>
> between commit:
>
> b69a2afd5afc ("x86/kexec: Carry forward IMA measurement log on kexec")
>
> from the tip tree and commit:
>
> c337d5c7ec9b ("x86/setup: Use rng seeds from setup_data")
Why is a x86 patch in the random tree?
And it doesn't even have a single x86 person ack?
https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git/commit/?id=c337d5c7ec9bc1d11006fd628e99c65f08455803
This is not now the process works.
--
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Martje Boudien Moerman
(HRB 36809, AG Nürnberg)
next prev parent reply other threads:[~2022-07-08 8:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-08 7:10 linux-next: manual merge of the random tree with the tip tree Stephen Rothwell
2022-07-08 8:13 ` Borislav Petkov [this message]
2022-07-08 9:21 ` Jason A. Donenfeld
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=YsfnDyOaKXA3iIj4@zn.tnic \
--to=bp@suse$(echo .)de \
--cc=Jason@zx2c4$(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=noodles@fb$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
--cc=tytso@mit$(echo .)edu \
/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