]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
projects / thirdparty / kernel / stable.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f82e8e f2e01dc)
Merge branch 'x86/nmi' into x86/core, to merge dependent commits
authorIngo Molnar <mingo@kernel.org>
Tue, 13 May 2025 08:46:04 +0000 (10:46 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 13 May 2025 08:46:04 +0000 (10:46 +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/kernel/setup.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/setup.c
Simple merge
Mirror https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git