From: Ingo Molnar Date: Tue, 13 May 2025 08:46:04 +0000 (+0200) Subject: Merge branch 'x86/nmi' into x86/core, to merge dependent commits X-Git-Tag: v6.16-rc1~195^2~24 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6680b0077af6a86cc28d2ac8bd7fa224d7f3b0b;p=thirdparty%2Fkernel%2Fstable.git 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 --- d6680b0077af6a86cc28d2ac8bd7fa224d7f3b0b