Re: linux-next: manual merge of the random tree with the tip tree
From: Jason A. Donenfeld
Date: Fri Jul 08 2022 - 05:26:42 EST
On 7/8/22, Borislav Petkov <bp@xxxxxxx> wrote:
> 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:
>> 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?
> This is not now the process works.
Sorry; I pushed it there temporarily to kick some CI to test it and
forgot to remove it.