Messages in this thread | | | Date | Fri, 8 Jul 2022 10:13:03 +0200 | From | Borislav Petkov <> | Subject | Re: linux-next: manual merge of the random tree with the tip tree |
| |
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)
| |