From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 May 2026 19:58:02 +0000 (-0700)
Subject: Merge tag 's390-7.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v7.1-rc2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb1d73f2cddccf717307e88c24cae619a9a80295;p=thirdparty%2Flinux.git

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

Pull s390 fixes from Alexander Gordeev:

 - Reject zero-length writes from userspace that corrupt Debug Facility
   buffers

 - Replace one s390 PCI maintainer

 - Remove SCLP_OFB Kconfig option and enable the guarded code
   unconditionally

 - Replace incorrect use of phys_to_folio() to virt_to_folio() in
   do_secure_storage_access()

* tag 's390-7.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/mm: Fix phys_to_folio() usage in do_secure_storage_access()
  s390/sclp: Remove SCLP_OFB Kconfig option
  MAINTAINERS: Replace one of the maintainers for s390/pci
  s390/debug: Reject zero-length input in debug_input_flush_fn()
  s390/debug: Reject zero-length input before trimming a newline
---

bb1d73f2cddccf717307e88c24cae619a9a80295