]> www.infradead.org Git - linux.git/commit
projects / linux.git / commit
summary | shortlog | log | commit | commitdiff | tree
(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)
commitd6680b0077af6a86cc28d2ac8bd7fa224d7f3b0b
tree598ad0f3f4d08240f5879ac0dd801c9257743e22tree
parent1f82e8e1ca18aa0b020538a3f227f5d56382638ecommit | diff
parentf2e01dcf6df2d12e86c363ea9c37d53994d89dd6commit | diff
Merge branch 'x86/nmi' 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/kernel/setup.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.