Linus,
Please pull the latest x86/boot git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-boot-2023-10-28
# HEAD: 50dcc2e0d62e3c4a54f39673c4dc3dcde7c74d52 x86/boot: efistub: Assign global boot_params variable
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;
Changes to the x86 boot code in v6.7:
- Rework PE header generation, primarily to generate a modern, 4k aligned
kernel image view with narrower W^X permissions.
- Further refine init-lifetime annotations
- Misc cleanups & fixes
Thanks,
Ingo
------------------>
Alexey Dobriyan (1):
x86/boot: Compile boot code with -std=gnu11 too
Ard Biesheuvel (17):
x86/efi: Drop EFI stub .bss from .data section
x86/efi: Disregard setup header of loaded image
x86/efi: Drop alignment flags from PE section headers
x86/boot: Remove the 'bugger off' message
x86/boot: Omit compression buffer from PE/COFF image memory footprint
x86/boot: Drop redundant code setting the root device
x86/boot: Drop references to startup_64
x86/boot: Grab kernel_info offset from zoffset header directly
x86/boot: Set EFI handover offset directly in header asm
x86/boot: Define setup size in linker script
x86/boot: Derive file size from _edata symbol
x86/boot: Construct PE/COFF .text section from assembler
x86/boot: Drop PE/COFF .reloc section
x86/boot: Split off PE/COFF .data section
x86/boot: Increase section and file alignment to 4k/512
x86/boot: Rename conflicting 'boot_params' pointer to 'boot_params_ptr'
x86/boot: efistub: Assign global boot_params variable
Hou Wenlong (3):
x86/head/64: Mark 'startup_gdt[]' and 'startup_gdt_descr' as __initdata
x86/head/64: Add missing __head annotation to startup_64_load_idt()
x86/head/64: Move the __head definition to <asm/init.h>
Wang Jinchao (1):
x86/boot: Harmonize the style of array-type parameter for fixup_pointer() calls
Yuntao Wang (1):
x86/boot: Fix incorrect startup_gdt_descr.size
arch/x86/Makefile | 2 +-
arch/x86/boot/Makefile | 2 +-
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/boot/compressed/vmlinux.lds.S | 6 +-
arch/x86/boot/header.S | 213 ++++++++++---------------
arch/x86/boot/setup.ld | 14 +-
arch/x86/boot/tools/build.c | 273 ++------------------------------
arch/x86/include/asm/boot.h | 2 +
arch/x86/include/asm/init.h | 2 +
arch/x86/kernel/head64.c | 17 +-
drivers/firmware/efi/libstub/Makefile | 7 -
drivers/firmware/efi/libstub/x86-stub.c | 48 +-----
20 files changed, 175 insertions(+), 504 deletions(-)
On Sat, 28 Oct 2023 at 03:11, Ingo Molnar <[email protected]> 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
The pull request you sent on Sat, 28 Oct 2023 15:10:59 +0200:
> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-boot-2023-10-28
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/2b95bb052656d46c2073b87f9487a53ef5e79732
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
On Mon, Oct 30 2023 at 14:10, Linus Torvalds wrote:
> On Sat, 28 Oct 2023 at 03:11, Ingo Molnar <[email protected]> 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.