commit acccef89f184a697fee1c96a1dc9cccbba36937b
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Fri Aug 7 08:06:53 2026 +0200

    Linux 5.10.264
    
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit dfefa3c51370f84acb643cddf98bb42c885d0483
Author: Borislav Petkov (AMD) <bp@alien8.de>
Date:   Wed Jul 29 19:35:27 2026 -0700

    x86/bugs: Make Safe-RET robust against interrupt injection
    
    An attacker injecting interrupts while the Safe-RET mitigation executes
    on machines affected by SRSO can neutralize the safe return sequence,
    potentially leading to data leakage through speculative execution.
    
    Fixup register state as if the Safe-RET sequence executed successfully
    by "emulating" it, in a manner of speaking, and avoid executing a RET
    instruction after returning from the interrupt.
    
    Co-developed-by: David Kaplan <David.Kaplan@amd.com>
    Signed-off-by: David Kaplan <David.Kaplan@amd.com>
    Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
    Signed-off-by: Wenkuan Wang <Wenkuan.Wang@amd.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit ad5e69629ebcec7615745142af5f6456ef942e80
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Fri Aug 7 07:53:29 2026 +0200

    Revert "x86/bugs: Make Safe-RET robust against interrupt injection"
    
    This reverts commit 9de1a49e8f1fbf7c372902573a27a97d4ab4d0af which is
    commit 7e7f81cf6f5ca3311e526308f55d7c54d3ba71f9 upstream.
    
    It was incorrect, a more correct fix will be applied next.
    
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>