From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Jun 2026 17:30:37 +0000 (-0700)
Subject: Merge tag 's390-7.1-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=2b414a95b8f7307d42173ba9e580d6d3e2bcbfce;p=thirdparty%2Flinux.git

Merge tag 's390-7.1-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 fix from Alexander Gordeev:

 - s390 selects GENERIC_LOCKBREAK when PREEMPT is enabled to tackle an
   old compile error that no longer exists. Since recently PREEMPT is
   always enabled, this LOCKBREAK config causes massive performance
   regressions.

   Remove GENERIC_LOCKBREAK from s390 Kconfig to fix the degradation.

* tag 's390-7.1-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: Remove GENERIC_LOCKBREAK Kconfig option
---

2b414a95b8f7307d42173ba9e580d6d3e2bcbfce