From: Ingo Molnar Date: Sat, 6 Apr 2024 11:00:32 +0000 (+0200) Subject: Merge branch 'linus' into x86/urgent, to pick up dependent commit X-Git-Tag: v6.9-rc4-pxa1908~71^2~1 X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=5f2ca44ed235c86a0d6b9bfb599d1664ea94b4b9;p=linux.git Merge branch 'linus' into x86/urgent, to pick up dependent commit We want to fix: 0e110732473e ("x86/retpoline: Do the necessary fixup to the Zen3/4 srso return thunk for !SRSO") So merge in Linus's latest into x86/urgent to have it available. Signed-off-by: Ingo Molnar --- 5f2ca44ed235c86a0d6b9bfb599d1664ea94b4b9