From: Ingo Molnar Date: Tue, 13 May 2025 08:32:24 +0000 (+0200) Subject: Merge branch 'x86/alternatives' into x86/core, to merge dependent commits X-Git-Tag: block-6.16-20250606~23^2~33 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=11d8f542d9137027440001b075da60a59c7871cb;p=linux-block.git Merge branch 'x86/alternatives' 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 --- 11d8f542d9137027440001b075da60a59c7871cb