[GIT PULL] s390 updates for final 7.1

From: Alexander Gordeev

Date: Thu Jun 11 2026 - 10:23:11 EST


Hi Linus,

please pull s390 updates for final 7.1.

Thanks,
Alexander Gordeev

The following changes since commit 7c6535c37dbc03c1c35926b7420d66fb122b513a:

s390: Implement _THIS_IP_ using inline asm (2026-05-30 11:33:32 +0200)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-7.1-5

for you to fetch changes up to 1f57f68c4dd101e5e8ffc9ffa6428f45bcdd776a:

s390: Remove GENERIC_LOCKBREAK Kconfig option (2026-06-08 18:59:07 +0200)

----------------------------------------------------------------
s390 fixes for final 7.1

- s390 selects GENERIC_LOCKBREAK when PREEMPT is enabled to tackle
an old compile error that no longer exists. Since recently PREEMPT
is always enabled, which causes massive performance regressions.
Remove GENERIC_LOCKBREAK from s390 Kconfig to fix the degradation.

----------------------------------------------------------------
Heiko Carstens (1):
s390: Remove GENERIC_LOCKBREAK Kconfig option

arch/s390/Kconfig | 3 ---
1 file changed, 3 deletions(-)

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index ecbcbb781e40..9921a3772bf7 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -29,9 +29,6 @@ config GENERIC_BUG
config GENERIC_BUG_RELATIVE_POINTERS
def_bool y

-config GENERIC_LOCKBREAK
- def_bool y if PREEMPTION
-
config AUDIT_ARCH
def_bool y