From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Aug 2023 16:06:38 +0000 (-0700)
Subject: Merge tag 's390-6.5-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v6.6.17~4271
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e0ba145952328bf1a9c2f0be0bd59a9cc5a7b21;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 's390-6.5-4' of git://git./linux/kernel/git/s390/linux

Pull s390 fixes from Heiko Carstens:

 - Split kernel large page mappings into 4k mappings in case debug
   pagealloc is enabled again. This got accidentally removed by commit
   bb1520d581a3 ("s390/mm: start kernel with DAT enabled")

 - Fix error handling in KVM's sthyi handling

 - Add missing include to s390's uapi ptrace.h

 - Update defconfigs

* tag 's390-6.5-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/ptrace: add missing linux/const.h include
  KVM: s390: fix sthyi error handling
  s390: update defconfigs
  s390/vmem: split pages when debug pagealloc is enabled
---

5e0ba145952328bf1a9c2f0be0bd59a9cc5a7b21