From: Thomas Gleixner <tglx@linutronix.de>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Andrew Morton <akpm@linux-foundation.org>,
Ard Biesheuvel <ardb@kernel.org>
Subject: Re: [GIT PULL] x86/boot changes for v6.7
Date: Tue, 31 Oct 2023 08:45:54 +0100 [thread overview]
Message-ID: <87pm0vxmj1.ffs@tglx> (raw)
In-Reply-To: <CAHk-=whiZvO3r+RbX71qxPgFYm0TGWMkPkNXNHcwPrhxLq633Q@mail.gmail.com>
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.
next prev parent reply other threads:[~2023-10-31 7:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-28 13:10 [GIT PULL] x86/boot changes for v6.7 Ingo Molnar
2023-10-31 0:10 ` Linus Torvalds
2023-10-31 7:45 ` Thomas Gleixner [this message]
2023-10-31 2:12 ` pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87pm0vxmj1.ffs@tglx \
--to=tglx@linutronix.de \
--cc=akpm@linux-foundation.org \
--cc=ardb@kernel.org \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox