linux-kernel - Re: linux-next: manual merge of the random tree with the tip tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAHmME9o052ooE6pC-Sa4EzohW7yRdepNy0zZAFFX6qr9Q+MoHA@mail.gmail.com>
Date:   Fri, 8 Jul 2022 11:21:31 +0200
From:   "Jason A. Donenfeld" <Jason@...c4.com>
To:     Borislav Petkov <bp@...e.de>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        "Theodore Ts'o" <tytso@....edu>,
        Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...hat.com>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Jonathan McDowell <noodles@...com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the random tree with the tip tree

On 7/8/22, Borislav Petkov <bp@...e.de> 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:
>>
>>   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.

Sorry; I pushed it there temporarily to kick some CI to test it and
forgot to remove it.

Jason