lkml.org 
[lkml]   [2023]   [Oct]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [GIT PULL] x86/boot changes for v6.7
Date
On Mon, Oct 30 2023 at 14:10, Linus Torvalds wrote:
> On Sat, 28 Oct 2023 at 03:11, Ingo Molnar <mingo@kernel.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.

\
 
 \ /
  Last update: 2023-10-31 08:46    [W:0.324 / U:0.068 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site