Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200227' into staging

Includes a headers update against 5.6-current.
- add missing vcpu reset functionality
- rstfy some s390 documentation
- fixes and enhancements

# gpg: Signature made Thu 27 Feb 2020 11:50:08 GMT
# gpg:                using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
# gpg:                issuer "cohuck@redhat.com"
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>" [marginal]
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>" [marginal]
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>" [marginal]
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20200227:
  s390x: Rename and use constants for short PSW address and mask
  docs: rstfy vfio-ap documentation
  docs: rstfy s390 dasd ipl documentation
  s390/sclp: improve special wait psw logic
  s390x: Add missing vcpu reset functions
  linux-headers: update
  target/s390x/translate: Fix RNSBG instruction

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --combined MAINTAINERS
index df1786db3207e892cbb8d2bc433db9d5f85ceebf,65c54874d8b2eccc226233aa39cb740498e9c702..0acb16cd1bf601b589c0cd45c4b214696f0b791a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1259,7 -1259,7 +1259,7 @@@ S: Supporte
  F: hw/s390x/ipl.*
  F: pc-bios/s390-ccw/
  F: pc-bios/s390-ccw.img
- F: docs/devel/s390-dasd-ipl.txt
+ F: docs/devel/s390-dasd-ipl.rst
  T: git https://github.com/borntraeger/qemu.git s390-next
  L: qemu-s390x@nongnu.org
  
@@@ -1570,7 -1570,7 +1570,7 @@@ F: hw/s390x/ap-bridge.
  F: include/hw/s390x/ap-device.h
  F: include/hw/s390x/ap-bridge.h
  F: hw/vfio/ap.c
- F: docs/vfio-ap.txt
+ F: docs/system/vfio-ap.rst
  L: qemu-s390x@nongnu.org
  
  vhost
@@@ -1639,12 -1639,6 +1639,12 @@@ F: hw/input/virtio-input*.
  F: include/hw/virtio/virtio-input.h
  F: contrib/vhost-user-input/*
  
 +virtio-iommu
 +M: Eric Auger <eric.auger@redhat.com>
 +S: Maintained
 +F: hw/virtio/virtio-iommu*.c
 +F: include/hw/virtio/virtio-iommu.h
 +
  virtio-serial
  M: Laurent Vivier <lvivier@redhat.com>
  R: Amit Shah <amit@kernel.org>