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

s390x updates:
- support for vfio-ccw to passthrough channel devices
- allow ccw bios to boot from scsi generic devices
- bugfix for initial reset

# gpg: Signature made Tue 23 May 2017 12:02:24 PM BST
# gpg:                using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* cohuck/tags/s390x-20170523: (21 commits)
  s390/kvm: do not reset riccb on initial cpu reset
  MAINTAINERS: Add vfio-ccw maintainer
  vfio/ccw: update sense data if a unit check is pending
  s390x/css: ccw translation infrastructure
  s390x/css: introduce and realize ccw-request callback
  vfio/ccw: get irqs info and set the eventfd fd
  vfio/ccw: get io region info
  vfio/ccw: vfio based subchannel passthrough driver
  s390x/css: device support for s390-ccw passthrough
  s390x/css: realize css_create_sch
  s390x/css: realize css_sch_build_schib
  s390x/css: add s390-squash-mcss machine option
  linux-headers: update
  pc-bios/s390-ccw.img: rebuild image
  pc-bios/s390-ccw: Build a reasonable max_sectors limit
  pc-bios/s390-ccw: Get Block Limits VPD device data
  pc-bios/s390-ccw: Get list of supported VPD pages
  pc-bios/s390-ccw: Refactor scsi_inquiry function
  pc-bios/s390-ccw: Break up virtio-scsi read into multiples
  pc-bios/s390-ccw: Move SCSI block factor to outer read
  ...

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

diff --combined qemu-options.hx
index f63f7dc946fd7e47c9d2cf1a0df62691b8c65674,1e5382c1e194f862b1509ff65cffbfe3f699011b..0c67319891fb39fcf77eedf2a7ca9a1e170dd6c8
--- 1/qemu-options.hx
--- 2/qemu-options.hx
+++ b/qemu-options.hx
@@@ -42,7 -42,8 +42,8 @@@ DEF("machine", HAS_ARG, QEMU_OPTION_mac
      "                dea-key-wrap=on|off controls support for DEA key wrapping (default=on)\n"
      "                suppress-vmdesc=on|off disables self-describing migration (default=off)\n"
      "                nvdimm=on|off controls NVDIMM support (default=off)\n"
-     "                enforce-config-section=on|off enforce configuration section migration (default=off)\n",
+     "                enforce-config-section=on|off enforce configuration section migration (default=off)\n"
+     "                s390-squash-mcss=on|off controls support for squashing into default css (default=off)\n",
      QEMU_ARCH_ALL)
  STEXI
  @item -machine [type=]@var{name}[,prop=@var{value}[,...]]
@@@ -81,6 -82,9 +82,9 @@@ controls whether DEA wrapping keys wil
  execution of DEA cryptographic functions.  The default is on.
  @item nvdimm=on|off
  Enables or disables NVDIMM support. The default is off.
+ @item s390-squash-mcss=on|off
+ Enables or disables squashing subchannels into the default css.
+ The default is off.
  @end table
  ETEXI
  
@@@ -4072,7 -4076,7 +4076,7 @@@ Create a filter-redirector we need to d
  be the same. we can just use indev or outdev, but at least one of indev or outdev
  need to be specified.
  
 -@item -object filter-rewriter,id=@var{id},netdev=@var{netdevid},rewriter-mode=@var{mode}[,queue=@var{all|rx|tx}]
 +@item -object filter-rewriter,id=@var{id},netdev=@var{netdevid}[,queue=@var{all|rx|tx}]
  
  Filter-rewriter is a part of COLO project.It will rewrite tcp packet to
  secondary from primary to keep secondary tcp connection,and rewrite