Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
MIME-Version: 1.0
References: <ZT0IY1INe8Jls7EC@gmail.com>
In-Reply-To: <ZT0IY1INe8Jls7EC@gmail.com>
From:   Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon, 30 Oct 2023 14:10:51 -1000
Message-ID: <CAHk-=whiZvO3r+RbX71qxPgFYm0TGWMkPkNXNHcwPrhxLq633Q@mail.gmail.com>
Subject: Re: [GIT PULL] x86/boot changes for v6.7
To:     Ingo Molnar <mingo@kernel.org>
Cc:     linux-kernel@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>,
        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>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Sat, 28 Oct 2023 at 03:11, Ingo Molnar <mingo@kernel.org> wrote:
>
> MERGE NOTE:
>
>  - 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?

               Linus