From: Ard Biesheuvel <ardb@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: Ard Biesheuvel <ardb@google.com>,
linux-efi@vger.kernel.org, x86@kernel.org
Subject: Re: [PATCH v2 0/2] x86/boot: Fix boot_params init in EFI stub
Date: Wed, 18 Oct 2023 14:57:24 +0200 [thread overview]
Message-ID: <CAMj1kXEPhwOMgiFHLfUyz4sR61rcxtLXzZKnkf+wL+EywvteuQ@mail.gmail.com> (raw)
In-Reply-To: <ZS/QFF/afdftXiaU@gmail.com>
On Wed, 18 Oct 2023 at 14:31, Ingo Molnar <mingo@kernel.org> wrote:
>
>
> * Ard Biesheuvel <ardb@google.com> wrote:
>
> > On Wed, Oct 18, 2023 at 11:55 AM Ingo Molnar <mingo@kernel.org> wrote:
> > >
> > >
> > > * Ard Biesheuvel <ardb@google.com> wrote:
> > >
> > > > From: Ard Biesheuvel <ardb@kernel.org>
> > > >
> > > > v2:
> > > > add separate patch to rename the decompressor's version of the
> > > > boot_params global variable
> > > >
> > > > Ard Biesheuvel (2):
> > > > x86/boot: Rename conflicting boot_params pointer to boot_params_p
> > > > x86/boot: efistub: Assign global boot_params variable
> > > >
> > > > arch/x86/boot/compressed/acpi.c | 14 +++++------
> > > > arch/x86/boot/compressed/cmdline.c | 4 +--
> > > > arch/x86/boot/compressed/ident_map_64.c | 7 +++---
> > > > arch/x86/boot/compressed/kaslr.c | 26 ++++++++++----------
> > > > arch/x86/boot/compressed/mem.c | 6 ++---
> > > > arch/x86/boot/compressed/misc.c | 24 +++++++++---------
> > > > arch/x86/boot/compressed/misc.h | 1 -
> > > > arch/x86/boot/compressed/pgtable_64.c | 9 +++----
> > > > arch/x86/boot/compressed/sev.c | 2 +-
> > > > arch/x86/include/asm/boot.h | 2 ++
> > > > drivers/firmware/efi/libstub/x86-stub.c | 2 ++
> > > > 11 files changed, 50 insertions(+), 47 deletions(-)
> > >
> > > Thanks!
> > >
> > > I renamed 'boot_params_p' to 'boot_params_ptr' for clarity - fortunately
> > > haven't run out of 't' and 'r' letters yet in the kernel.
> > >
> >
> > OK thanks.
> >
> > I noticed you queued this up for v6.7.
> > So what should we do for v6.6 wrt the second patch?
>
> I presumed you'd queue it up in the EFI tree, and I'll merge it & resolve
> the conflict once it hits upstream?
>
Yup, works for me - I just wanted to double check.
prev parent reply other threads:[~2023-10-18 12:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-17 13:25 [PATCH v2 0/2] x86/boot: Fix boot_params init in EFI stub Ard Biesheuvel
2023-10-17 13:25 ` [PATCH v2 1/2] x86/boot: Rename conflicting boot_params pointer to boot_params_p Ard Biesheuvel
2023-10-17 13:25 ` [PATCH v2 2/2] x86/boot: efistub: Assign global boot_params variable Ard Biesheuvel
2023-10-18 9:55 ` [PATCH v2 0/2] x86/boot: Fix boot_params init in EFI stub Ingo Molnar
2023-10-18 12:10 ` Ard Biesheuvel
2023-10-18 12:31 ` Ingo Molnar
2023-10-18 12:57 ` Ard Biesheuvel [this message]
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=CAMj1kXEPhwOMgiFHLfUyz4sR61rcxtLXzZKnkf+wL+EywvteuQ@mail.gmail.com \
--to=ardb@kernel.org \
--cc=ardb@google.com \
--cc=linux-efi@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=x86@kernel.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).