[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <87pm0vxmj1.ffs@tglx>
Date:   Tue, 31 Oct 2023 08:45:54 +0100
From:   Thomas Gleixner <tglx@...utronix.de>
To:     Linus Torvalds <torvalds@...ux-foundation.org>,
        Ingo Molnar <mingo@...nel.org>
Cc:     linux-kernel@...r.kernel.org, Borislav Petkov <bp@...en8.de>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Ard Biesheuvel <ardb@...nel.org>
Subject: Re: [GIT PULL] x86/boot changes for v6.7
On Mon, Oct 30 2023 at 14:10, Linus Torvalds wrote:
> On Sat, 28 Oct 2023 at 03:11, Ingo Molnar <mingo@...nel.org> wrote:
>>  - Pulling this tree will generate a conflict in
>>    drivers/firmware/efi/libstub/x86-stub.c, due to a fix we wanted upstream
>>    without related cleanups, which is resolved by picking this resolution:
>>
>>         boot_params_ptr = boot_params;
>
> Hmm. I think I should also remove the now legacy line of
>
>    extern struct boot_params *boot_params_pointer asm("boot_params");
>
> from drivers/firmware/efi/libstub/x86-stub.h, no?
Indeed.
Powered by blists - more mailing lists