]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Merge branch 'linus' into x86/urgent, to pick up dependent commit
authorIngo Molnar <mingo@kernel.org>
Sat, 6 Apr 2024 11:00:32 +0000 (13:00 +0200)
committerIngo Molnar <mingo@kernel.org>
Sat, 6 Apr 2024 11:00:32 +0000 (13:00 +0200)
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 <mingo@kernel.org>
1  2 
arch/x86/kvm/svm/sev.c

Simple merge