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

Pull more s390 updates from Heiko Carstens:

 - add support for system call stack randomization

 - handle stale PCI deconfiguration events

 - couple of defconfig updates

 - some fixes and cleanups

* tag 's390-5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: fix detection of vector enhancements facility 1 vs. vector packed decimal facility
  s390/entry: add support for syscall stack randomization
  s390/configs: change CONFIG_VIRTIO_CONSOLE to "m"
  s390/cio: remove invalid condition on IO_SCH_UNREG
  s390/cpumf: remove call to perf_event_update_userpage
  s390/cpumf: move counter set size calculation to common place
  s390/cpumf: beautify if-then-else indentation
  s390/configs: enable CONFIG_PCI_IOV
  s390/pci: handle stale deconfiguration events
  s390/pci: rename zpci_configure_device()

diff --combined arch/s390/Kconfig
index d72989591223c18bbfb32ed634c9c23b4a43e990,1900428ce557c3646df494eb968676792b811042..b4c7c34069f81a0e52e0cc4cefafbf381113fad5
--- 1/arch/s390/Kconfig
--- 2/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -60,9 -60,6 +60,9 @@@ config S39
        imply IMA_SECURE_AND_OR_TRUSTED_BOOT
        select ARCH_32BIT_USTAT_F_TINODE
        select ARCH_BINFMT_ELF_STATE
 +      select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM
 +      select ARCH_ENABLE_MEMORY_HOTREMOVE
 +      select ARCH_ENABLE_SPLIT_PMD_PTLOCK
        select ARCH_HAS_DEBUG_VM_PGTABLE
        select ARCH_HAS_DEBUG_WX
        select ARCH_HAS_DEVMEM_IS_ALLOWED
@@@ -140,6 -137,7 +140,7 @@@
        select HAVE_ARCH_JUMP_LABEL_RELATIVE
        select HAVE_ARCH_KASAN
        select HAVE_ARCH_KASAN_VMALLOC
+       select HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET
        select HAVE_ARCH_SECCOMP_FILTER
        select HAVE_ARCH_SOFT_DIRTY
        select HAVE_ARCH_TRACEHOOK
@@@ -629,6 -627,15 +630,6 @@@ config ARCH_SPARSEMEM_ENABL
  config ARCH_SPARSEMEM_DEFAULT
        def_bool y
  
 -config ARCH_ENABLE_MEMORY_HOTPLUG
 -      def_bool y if SPARSEMEM
 -
 -config ARCH_ENABLE_MEMORY_HOTREMOVE
 -      def_bool y
 -
 -config ARCH_ENABLE_SPLIT_PMD_PTLOCK
 -      def_bool y
 -
  config MAX_PHYSMEM_BITS
        int "Maximum size of supported physical memory in bits (42-53)"
        range 42 53