]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 206c07d ed4d95d)
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)
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>
1  2 
arch/x86/boot/boot.h patch | diff1 | diff2 | blob | history
arch/x86/kernel/vmlinux.lds.S patch | diff1 | diff2 | blob | history

diff --cc arch/x86/boot/boot.h
Simple merge
diff --cc arch/x86/kernel/vmlinux.lds.S
Simple merge
XArray, radix tree and IDR