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

Pull s390 fixes from Martin Schwidefsky:

 - a fix for the vfio ccw translation code

 - update an incorrect email address in the MAINTAINERS file

 - fix a division by zero oops in the cpum_sf code found by trinity

 - two fixes for the error handling of the qdio code

 - several spectre related patches to convert all left-over indirect
   branches in the kernel to expoline branches

 - update defconfigs to avoid warnings due to the netfilter Kconfig
   changes

 - avoid several compiler warnings in the kexec_file code for s390

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/qdio: don't release memory in qdio_setup_irq()
  s390/qdio: fix access to uninitialized qdio_q fields
  s390/cpum_sf: ensure sample frequency of perf event attributes is non-zero
  s390: use expoline thunks in the BPF JIT
  s390: extend expoline to BC instructions
  s390: remove indirect branch from do_softirq_own_stack
  s390: move spectre sysfs attribute code
  s390/kernel: use expoline for indirect branches
  s390/ftrace: use expoline for indirect branches
  s390/lib: use expoline for indirect branches
  s390/crc32-vx: use expoline for indirect branches
  s390: move expoline assembler macros to a header
  vfio: ccw: fix cleanup if cp_prefetch fails
  s390/kexec_file: add declaration of purgatory related globals
  s390: update defconfigs
  MAINTAINERS: update s390 zcrypt maintainers email address

diff --combined MAINTAINERS
index 58b9861ccf995d73c96da993ce8900f180982e8f,2ad33062c9e3bde0956f42fafefd12bfe650ed9e..92e47b5b0480fe142e3d6082520224f3933c0a37
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -137,9 -137,9 +137,9 @@@ Maintainers List (try to look for most 
                -----------------------------------
  
  3C59X NETWORK DRIVER
 -M:    Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
 +M:    Steffen Klassert <klassert@kernel.org>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/networking/vortex.txt
  F:    drivers/net/ethernet/3com/3c59x.c
  
@@@ -564,9 -564,8 +564,9 @@@ S: Maintaine
  F:    drivers/media/dvb-frontends/af9033*
  
  AFFS FILE SYSTEM
 +M:    David Sterba <[email protected]>
  L:    [email protected]
 -S:    Orphan
 +S:    Odd Fixes
  F:    Documentation/filesystems/affs.txt
  F:    fs/affs/
  
@@@ -906,8 -905,6 +906,8 @@@ ANDROID ION DRIVE
  M:    Laura Abbott <[email protected]>
  M:    Sumit Semwal <[email protected]>
  L:    [email protected]
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    drivers/staging/android/ion
  F:    drivers/staging/android/uapi/ion.h
@@@ -1211,6 -1208,7 +1211,6 @@@ F:      drivers/*/*alpine
  ARM/ARTPEC MACHINE SUPPORT
  M:    Jesper Nilsson <[email protected]>
  M:    Lars Persson <[email protected]>
 -M:    Niklas Cassel <[email protected]>
  S:    Maintained
  L:    [email protected]
  F:    arch/arm/mach-artpec
@@@ -2554,6 -2552,7 +2554,6 @@@ F:      Documentation/devicetree/bindings/so
  F:    sound/soc/atmel/tse850-pcm5142.c
  
  AZ6007 DVB DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -3082,6 -3081,7 +3082,6 @@@ F:      include/linux/btrfs
  F:    include/uapi/linux/btrfs*
  
  BTTV VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -3691,6 -3691,7 +3691,6 @@@ F:      drivers/cpufreq/arm_big_little_dt.
  
  CPU POWER MONITORING SUBSYSTEM
  M:    Thomas Renninger <[email protected]>
 -M:    Shuah Khan <[email protected]>
  M:    Shuah Khan <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -3809,6 -3810,7 +3809,6 @@@ S:      Maintaine
  F:    drivers/media/dvb-frontends/cx24120*
  
  CX88 VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -5049,6 -5051,7 +5049,6 @@@ F:      drivers/edac/thunderx_edac
  
  EDAC-CORE
  M:    Borislav Petkov <[email protected]>
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
@@@ -5077,6 -5080,7 +5077,6 @@@ S:      Maintaine
  F:    drivers/edac/fsl_ddr_edac.*
  
  EDAC-GHES
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5093,18 -5097,21 +5093,18 @@@ S:   Maintaine
  F:    drivers/edac/i5000_edac.c
  
  EDAC-I5400
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/i5400_edac.c
  
  EDAC-I7300
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/i7300_edac.c
  
  EDAC-I7CORE
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5154,6 -5161,7 +5154,6 @@@ S:      Maintaine
  F:    drivers/edac/r82600_edac.c
  
  EDAC-SBRIDGE
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5212,6 -5220,7 +5212,6 @@@ S:      Maintaine
  F:    drivers/net/ethernet/ibm/ehea/
  
  EM28XX VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -7402,6 -7411,16 +7402,6 @@@ S:     Obsolet
  F:    include/uapi/linux/ipx.h
  F:    drivers/staging/ipx/
  
 -IRDA SUBSYSTEM
 -M:    Samuel Ortiz <[email protected]>
 -L:    [email protected] (subscribers-only)
 -L:    [email protected]
 -W:    http://irda.sourceforge.net/
 -S:    Obsolete
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git
 -F:    Documentation/networking/irda.txt
 -F:    drivers/staging/irda/
 -
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
  M:    Marc Zyngier <[email protected]>
  S:    Maintained
@@@ -7666,11 -7685,9 +7666,11 @@@ L:    [email protected]
  S:    Maintained
  F:    Documentation/kbuild/
  F:    Makefile
 -F:    scripts/Makefile.*
 +F:    scripts/Kbuild*
 +F:    scripts/Makefile*
  F:    scripts/basic/
  F:    scripts/mk*
 +F:    scripts/mod/
  F:    scripts/package/
  
  KERNEL JANITORS
@@@ -7695,6 -7712,7 +7695,6 @@@ F:      include/linux/sunrpc
  F:    include/uapi/linux/sunrpc/
  
  KERNEL SELFTEST FRAMEWORK
 -M:    Shuah Khan <[email protected]>
  M:    Shuah Khan <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
@@@ -7735,7 -7753,7 +7735,7 @@@ F:      arch/x86/include/asm/svm.
  F:    arch/x86/kvm/svm.c
  
  KERNEL VIRTUAL MACHINE FOR ARM (KVM/arm)
 -M:    Christoffer Dall <christoffer.dall@linaro.org>
 +M:    Christoffer Dall <christoffer.dall@arm.com>
  M:    Marc Zyngier <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -7749,7 -7767,7 +7749,7 @@@ F:      virt/kvm/arm
  F:    include/kvm/arm_*
  
  KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
 -M:    Christoffer Dall <christoffer.dall@linaro.org>
 +M:    Christoffer Dall <christoffer.dall@arm.com>
  M:    Marc Zyngier <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -8861,6 -8879,7 +8861,6 @@@ F:      Documentation/devicetree/bindings/me
  F:    drivers/staging/media/tegra-vde/
  
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  P:    LinuxTV.org Project
  L:    [email protected]
@@@ -9714,7 -9733,6 +9714,7 @@@ W:      https://fedorahosted.org/dropwatch
  F:    net/core/drop_monitor.c
  
  NETWORKING DRIVERS
 +M:    "David S. Miller" <[email protected]>
  L:    [email protected]
  W:    http://www.linuxfoundation.org/en/Net
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
@@@ -9871,7 -9889,7 +9871,7 @@@ F:      include/linux/platform_data/nxp-nci.
  F:    Documentation/devicetree/bindings/net/nfc/
  
  NFS, SUNRPC, AND LOCKD CLIENTS
 -M:    Trond Myklebust <trond.myklebust@primarydata.com>
 +M:    Trond Myklebust <trond.myklebust@hammerspace.com>
  M:    Anna Schumaker <[email protected]>
  L:    [email protected]
  W:    http://client.linux-nfs.org
@@@ -10891,6 -10909,7 +10891,6 @@@ F:   drivers/pci/host
  F:    drivers/pci/dwc/
  
  PCIE DRIVER FOR AXIS ARTPEC
 -M:    Niklas Cassel <[email protected]>
  M:    Jesper Nilsson <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -12220,7 -12239,7 +12220,7 @@@ F:   Documentation/s390/vfio-ccw.tx
  F:    include/uapi/linux/vfio_ccw.h
  
  S390 ZCRYPT DRIVER
- M:    Harald Freudenberger <freude@de.ibm.com>
+ M:    Harald Freudenberger <freude@linux.ibm.com>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -12249,6 -12268,7 +12249,6 @@@ S:   Odd Fixe
  F:    drivers/media/i2c/saa6588*
  
  SAA7134 VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -12487,7 -12507,6 +12487,7 @@@ F:   drivers/scsi/st_*.
  SCTP PROTOCOL
  M:    Vlad Yasevich <[email protected]>
  M:    Neil Horman <[email protected]>
 +M:    Marcelo Ricardo Leitner <[email protected]>
  L:    [email protected]
  W:    http://lksctp.sourceforge.net
  S:    Maintained
@@@ -12753,6 -12772,7 +12753,6 @@@ S:   Maintaine
  F:    drivers/media/radio/si4713/radio-usb-si4713.c
  
  SIANO DVB DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -13743,6 -13763,7 +13743,6 @@@ S:   Maintaine
  F:    drivers/media/i2c/tda9840*
  
  TEA5761 TUNER DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -13751,6 -13772,7 +13751,6 @@@ S:   Odd fixe
  F:    drivers/media/tuners/tea5761.*
  
  TEA5767 TUNER DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -13840,6 -13862,7 +13840,6 @@@ S:   Supporte
  F:    drivers/iommu/tegra*
  
  TEGRA KBC DRIVER
 -M:    Rakesh Iyer <[email protected]>
  M:    Laxman Dewangan <[email protected]>
  S:    Supported
  F:    drivers/input/keyboard/tegra-kbc.c
@@@ -13942,7 -13965,7 +13942,7 @@@ THUNDERBOLT DRIVE
  M:    Andreas Noever <[email protected]>
  M:    Michael Jamet <[email protected]>
  M:    Mika Westerberg <[email protected]>
 -M:    Yehezkel Bernat <yehezkel.bernat@intel.com>
 +M:    Yehezkel Bernat <YehezkelShB@gmail.com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
  S:    Maintained
  F:    Documentation/admin-guide/thunderbolt.rst
@@@ -13952,7 -13975,7 +13952,7 @@@ F:   include/linux/thunderbolt.
  THUNDERBOLT NETWORK DRIVER
  M:    Michael Jamet <[email protected]>
  M:    Mika Westerberg <[email protected]>
 -M:    Yehezkel Bernat <yehezkel.bernat@intel.com>
 +M:    Yehezkel Bernat <YehezkelShB@gmail.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/thunderbolt.c
@@@ -14166,6 -14189,7 +14166,6 @@@ F:   Documentation/networking/tlan.tx
  F:    drivers/net/ethernet/ti/tlan.*
  
  TM6000 VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -14648,6 -14672,7 +14648,6 @@@ F:   drivers/usb/common/usb-otg-fsm.
  
  USB OVER IP DRIVER
  M:    Valentina Manea <[email protected]>
 -M:    Shuah Khan <[email protected]>
  M:    Shuah Khan <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -15391,6 -15416,7 +15391,6 @@@ S:   Maintaine
  F:    arch/x86/entry/vdso/
  
  XC2028/3028 TUNER DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org