Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
In-Reply-To: <YsfnDyOaKXA3iIj4@zn.tnic>
References: <20220708171030.135b12cd@canb.auug.org.au> <YsfnDyOaKXA3iIj4@zn.tnic>
From:   "Jason A. Donenfeld" <Jason@zx2c4.com>
Date:   Fri, 8 Jul 2022 11:21:31 +0200
Message-ID: <CAHmME9o052ooE6pC-Sa4EzohW7yRdepNy0zZAFFX6qr9Q+MoHA@mail.gmail.com>
Subject: Re: linux-next: manual merge of the random tree with the tip tree
To:     Borislav Petkov <bp@suse.de>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        "Theodore Ts'o" <tytso@mit.edu>,
        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>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

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