I'm announcing the release of the 6.1.48 kernel. All users of the 6.1 kernel series must upgrade. The updated 6.1.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.1.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/admin-guide/hw-vuln/srso.rst | 4 Makefile | 2 arch/x86/include/asm/entry-common.h | 1 arch/x86/include/asm/nospec-branch.h | 28 +++--- arch/x86/kernel/cpu/amd.c | 1 arch/x86/kernel/cpu/bugs.c | 28 ++++-- arch/x86/kernel/static_call.c | 13 ++ arch/x86/kernel/traps.c | 2 arch/x86/kernel/vmlinux.lds.S | 20 ++-- arch/x86/kvm/svm/svm.c | 2 arch/x86/lib/retpoline.S | 135 ++++++++++++++++++++--------- tools/objtool/arch/x86/decode.c | 2 tools/objtool/check.c | 21 ++-- 13 files changed, 178 insertions(+), 81 deletions(-) Borislav Petkov (AMD) (4): x86/srso: Explain the untraining sequences a bit more x86/CPU/AMD: Fix the DIV(0) initial fix attempt x86/srso: Disable the mitigation on unaffected configurations x86/srso: Correct the mitigation status when SMT is disabled Greg Kroah-Hartman (1): Linux 6.1.48 Peter Zijlstra (9): x86/cpu: Fix __x86_return_thunk symbol type x86/cpu: Fix up srso_safe_ret() and __x86_return_thunk() x86/alternative: Make custom return thunk unconditional x86/cpu: Clean up SRSO return thunk mess x86/cpu: Rename original retbleed methods x86/cpu: Rename srso_(.*)_alias to srso_alias_\1 x86/cpu: Cleanup the untrain mess x86/static_call: Fix __static_call_fixup() objtool/x86: Fixup frame-pointer vs rethunk Petr Pavlu (1): x86/retpoline,kprobes: Fix position of thunk sections with CONFIG_LTO_CLANG Sean Christopherson (1): x86/retpoline: Don't clobber RFLAGS during srso_safe_ret()
