linux-kernel - Re: [GIT PULL] x86/boot changes for v6.7

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAHk-=whiZvO3r+RbX71qxPgFYm0TGWMkPkNXNHcwPrhxLq633Q@mail.gmail.com>
Date:   Mon, 30 Oct 2023 14:10:51 -1000
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Ingo Molnar <mingo@...nel.org>
Cc:     linux-kernel@...r.kernel.org, Thomas Gleixner <tglx@...utronix.de>,
        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 Sat, 28 Oct 2023 at 03:11, Ingo Molnar <mingo@...nel.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