Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull  more s390 updates from Martin Schwidefsky:
 "Three notable larger changes next to the usual bug fixing:

   - update the email addresses in MAINTAINERS for the s390 folks to use
     the simpler linux.ibm.com domain instead of the old
     linux.vnet.ibm.com

   - an update for the zcrypt device driver that removes some old and
     obsolete interfaces and add support for up to 256 crypto adapters

   - a rework of the IPL aka boot code"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (23 commits)
  s390: correct nospec auto detection init order
  s390/zcrypt: Support up to 256 crypto adapters.
  s390/zcrypt: Remove deprecated zcrypt proc interface.
  s390/zcrypt: Remove deprecated ioctls.
  s390/zcrypt: Make ap init functions static.
  MAINTAINERS: update s390 maintainers email addresses
  s390/ipl: remove reipl_method and dump_method
  s390/ipl: correct kdump reipl block checksum calculation
  s390/ipl: remove non-existing functions declaration
  s390: assume diag308 set always works
  s390/ipl: avoid adding scpdata to cmdline during ftp/dvd boot
  s390/ipl: correct ipl parmblock valid checks
  s390/ipl: rely on diag308 store to get ipl info
  s390/ipl: move ipl_flags to ipl.c
  s390/ipl: get rid of ipl_ssid and ipl_devno
  s390/ipl: unite diag308 and scsi boot ipl blocks
  s390/ipl: ensure loadparm valid flag is set
  s390/qdio: lock device while installing IRQ handler
  s390/qdio: clear intparm during shutdown
  s390/ccwgroup: require at least one ccw device
  ...

1 files changed, 17 insertions, 17 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index b60179d948bb..73d83416d852 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5843,7 +5843,7 @@ F:	scripts/Makefile.gcc-plugins
 F:      Documentation/gcc-plugins.txt
 
 GCOV BASED KERNEL PROFILING
-M:      Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
+M:      Peter Oberparleiter <oberpar@linux.ibm.com>
 S:      Maintained
 F:      kernel/gcov/
 F:      Documentation/dev-tools/gcov.rst
@@ -7768,7 +7768,7 @@ F:	arch/powerpc/kernel/kvm*
 
 KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
 M:      Christian Borntraeger <borntraeger@de.ibm.com>
-M:      Janosch Frank <frankja@linux.vnet.ibm.com>
+M:      Janosch Frank <frankja@linux.ibm.com>
 R:      David Hildenbrand <david@redhat.com>
 R:      Cornelia Huck <cohuck@redhat.com>
 L:      linux-s390@vger.kernel.org
@@ -12124,16 +12124,16 @@ F:	Documentation/s390/
 F:      Documentation/driver-api/s390-drivers.rst
 
 S390 COMMON I/O LAYER
-M:      Sebastian Ott <sebott@linux.vnet.ibm.com>
-M:      Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
+M:      Sebastian Ott <sebott@linux.ibm.com>
+M:      Peter Oberparleiter <oberpar@linux.ibm.com>
 L:      linux-s390@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
 F:      drivers/s390/cio/
 
 S390 DASD DRIVER
-M:      Stefan Haberland <sth@linux.vnet.ibm.com>
-M:      Jan Hoeppner <hoeppner@linux.vnet.ibm.com>
+M:      Stefan Haberland <sth@linux.ibm.com>
+M:      Jan Hoeppner <hoeppner@linux.ibm.com>
 L:      linux-s390@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
@@ -12148,8 +12148,8 @@ S:	Supported
 F:      drivers/iommu/s390-iommu.c
 
 S390 IUCV NETWORK LAYER
-M:      Julian Wiedmann <jwi@linux.vnet.ibm.com>
-M:      Ursula Braun <ubraun@linux.vnet.ibm.com>
+M:      Julian Wiedmann <jwi@linux.ibm.com>
+M:      Ursula Braun <ubraun@linux.ibm.com>
 L:      linux-s390@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
@@ -12158,15 +12158,15 @@ F:	include/net/iucv/
 F:      net/iucv/
 
 S390 NETWORK DRIVERS
-M:      Julian Wiedmann <jwi@linux.vnet.ibm.com>
-M:      Ursula Braun <ubraun@linux.vnet.ibm.com>
+M:      Julian Wiedmann <jwi@linux.ibm.com>
+M:      Ursula Braun <ubraun@linux.ibm.com>
 L:      linux-s390@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
 F:      drivers/s390/net/
 
 S390 PCI SUBSYSTEM
-M:      Sebastian Ott <sebott@linux.vnet.ibm.com>
+M:      Sebastian Ott <sebott@linux.ibm.com>
 M:      Gerald Schaefer <gerald.schaefer@de.ibm.com>
 L:      linux-s390@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
@@ -12176,8 +12176,8 @@ F:	drivers/pci/hotplug/s390_pci_hpc.c
 
 S390 VFIO-CCW DRIVER
 M:      Cornelia Huck <cohuck@redhat.com>
-M:      Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
-M:      Halil Pasic <pasic@linux.vnet.ibm.com>
+M:      Dong Jia Shi <bjsdjshi@linux.ibm.com>
+M:      Halil Pasic <pasic@linux.ibm.com>
 L:      linux-s390@vger.kernel.org
 L:      kvm@vger.kernel.org
 S:      Supported
@@ -12193,8 +12193,8 @@ S:	Supported
 F:      drivers/s390/crypto/
 
 S390 ZFCP DRIVER
-M:      Steffen Maier <maier@linux.vnet.ibm.com>
-M:      Benjamin Block <bblock@linux.vnet.ibm.com>
+M:      Steffen Maier <maier@linux.ibm.com>
+M:      Benjamin Block <bblock@linux.ibm.com>
 L:      linux-s390@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
@@ -12630,7 +12630,7 @@ S:	Maintained
 F:      drivers/misc/sgi-xp/
 
 SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
-M:      Ursula Braun <ubraun@linux.vnet.ibm.com>
+M:      Ursula Braun <ubraun@linux.ibm.com>
 L:      linux-s390@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
@@ -14965,7 +14965,7 @@ F:	include/uapi/linux/virtio_crypto.h
 
 VIRTIO DRIVERS FOR S390
 M:      Cornelia Huck <cohuck@redhat.com>
-M:      Halil Pasic <pasic@linux.vnet.ibm.com>
+M:      Halil Pasic <pasic@linux.ibm.com>
 L:      linux-s390@vger.kernel.org
 L:      virtualization@lists.linux-foundation.org
 L:      kvm@vger.kernel.org