Merge branch 'x86/boot' into x86/core, to merge dependent commits
authorIngo Molnar <mingo@kernel.org>
Tue, 13 May 2025 08:35:27 +0000 (10:35 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 13 May 2025 08:35:27 +0000 (10:35 +0200)
commit821f82125c47217390099532b09bd09cee9adaac
tree26b526b4ffa17e5bd302381bff5d4bbadfe1299d
parent206c07d6ab88e0bb02e7c0dc134b38f7973e968b
parented4d95d033e359f9445e85bf5a768a5859a5830b
Merge branch 'x86/boot' into x86/core, to merge dependent commits

Prepare to resolve conflicts with an upstream series of fixes that conflict
with pending x86 changes:

  6f5bf947bab0 Merge tag 'its-for-linus-20250509' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/boot/boot.h
arch/x86/kernel/vmlinux.lds.S