Merge tag 's390-6.7-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 fixes from Alexander Gordeev:

 - Fix virtual vs physical address confusion in Storage Class Memory
   (SCM) block device driver.

 - Fix saving and restoring of FPU kernel context, which could lead to
   corruption of vector registers 8-15

 - Update defconfigs

* tag 's390-6.7-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: update defconfigs
  s390/vx: fix save/restore of fpu kernel context
  s390/scm: fix virtual vs physical address confusion

diff --combined arch/s390/configs/debug_defconfig
index dd06086293106ed963268d0c6c95fdc8c58ef694,9205d85da922a027a53014cd619ff621fe2e1726..6de44ede4e14ddfb8495cdd076d7ca5a64f6a9bb
--- 1/arch/s390/configs/debug_defconfig
--- 2/arch/s390/configs/debug_defconfig
+++ b/arch/s390/configs/debug_defconfig
@@@ -44,8 -44,7 +44,7 @@@ CONFIG_KEXEC_FILE=
  CONFIG_KEXEC_SIG=y
  CONFIG_CRASH_DUMP=y
  CONFIG_LIVEPATCH=y
- CONFIG_MARCH_ZEC12=y
- CONFIG_TUNE_ZEC12=y
+ CONFIG_MARCH_Z13=y
  CONFIG_NR_CPUS=512
  CONFIG_NUMA=y
  CONFIG_HZ_100=y
@@@ -76,7 -75,6 +75,6 @@@ CONFIG_MODULE_FORCE_UNLOAD=
  CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y
  CONFIG_MODVERSIONS=y
  CONFIG_MODULE_SRCVERSION_ALL=y
- CONFIG_MODULE_SIG_SHA256=y
  CONFIG_BLK_DEV_THROTTLING=y
  CONFIG_BLK_WBT=y
  CONFIG_BLK_CGROUP_IOLATENCY=y
@@@ -93,6 -91,7 +91,7 @@@ CONFIG_UNIXWARE_DISKLABEL=
  CONFIG_IOSCHED_BFQ=y
  CONFIG_BINFMT_MISC=m
  CONFIG_ZSWAP=y
+ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
  CONFIG_ZSMALLOC_STAT=y
  CONFIG_SLUB_STATS=y
  # CONFIG_COMPAT_BRK is not set
@@@ -619,6 -618,9 +618,9 @@@ CONFIG_BTRFS_FS_POSIX_ACL=
  CONFIG_BTRFS_DEBUG=y
  CONFIG_BTRFS_ASSERT=y
  CONFIG_NILFS2_FS=m
+ CONFIG_BCACHEFS_FS=y
+ CONFIG_BCACHEFS_QUOTA=y
+ CONFIG_BCACHEFS_POSIX_ACL=y
  CONFIG_FS_DAX=y
  CONFIG_EXPORTFS_BLOCK_OPS=y
  CONFIG_FS_ENCRYPTION=y
@@@ -691,7 -693,6 +693,6 @@@ CONFIG_PERSISTENT_KEYRINGS=
  CONFIG_ENCRYPTED_KEYS=m
  CONFIG_KEY_NOTIFICATIONS=y
  CONFIG_SECURITY=y
- CONFIG_SECURITY_NETWORK=y
  CONFIG_HARDENED_USERCOPY=y
  CONFIG_FORTIFY_SOURCE=y
  CONFIG_SECURITY_SELINUX=y
@@@ -834,6 -835,7 +835,6 @@@ CONFIG_DEBUG_IRQFLAGS=
  CONFIG_DEBUG_LIST=y
  CONFIG_DEBUG_SG=y
  CONFIG_DEBUG_NOTIFIERS=y
 -CONFIG_DEBUG_CREDENTIALS=y
  CONFIG_RCU_TORTURE_TEST=m
  CONFIG_RCU_REF_SCALE_TEST=m
  CONFIG_RCU_CPU_STALL_TIMEOUT=300