Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Pull virtio/vhost fixes from Michael Tsirkin:
 "Bugfixes and documentation fixes.

  Igor's patch that allows users to tweak memory table size is
  borderline, but it does fix known crashes, so I merged it"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost: add max_mem_regions module parameter
  vhost: extend memory regions allocation to vmalloc
  9p/trans_virtio: reset virtio device on remove
  virtio/s390: rename drivers/s390/kvm -> drivers/s390/virtio
  MAINTAINERS: separate section for s390 virtio drivers
  virtio: define virtio_pci_cfg_cap in header.
  virtio: Fix typecast of pointer in vring_init()
  virtio scsi: fix unused variable warning
  vhost: use binary search instead of linear in find_region()
  virtio_net: document VIRTIO_NET_CTRL_GUEST_OFFLOADS

diff --cc MAINTAINERS
index a226416,fbef7d0..2eb6272
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -10896,15 -10570,15 +10895,24 @@@ F:        drivers/block/virtio_blk.
  F:    include/linux/virtio_*.h
  F:    include/uapi/linux/virtio_*.h
  
+ VIRTIO DRIVERS FOR S390
+ M:    Christian Borntraeger <borntraeger@de.ibm.com>
+ M:    Cornelia Huck <cornelia.huck@de.ibm.com>
+ L:    linux-s390@vger.kernel.org
+ L:    virtualization@lists.linux-foundation.org
+ L:    kvm@vger.kernel.org
+ S:    Supported
+ F:    drivers/s390/virtio/
+ 
 +VIRTIO GPU DRIVER
 +M:    David Airlie <airlied@linux.ie>
 +M:    Gerd Hoffmann <kraxel@redhat.com>
 +L:    dri-devel@lists.freedesktop.org
 +L:    virtualization@lists.linux-foundation.org
 +S:    Maintained
 +F:    drivers/gpu/drm/virtio/
 +F:    include/uapi/linux/virtio_gpu.h
 +
  VIRTIO HOST (VHOST)
  M:    "Michael S. Tsirkin" <mst@redhat.com>
  L:    kvm@vger.kernel.org

diff --cc drivers/s390/virtio/kvm_virtio.c
Simple merge

diff --cc drivers/s390/virtio/virtio_ccw.c
Simple merge

diff --cc drivers/scsi/virtio_scsi.c
index 285f775,55441c7..7dbbb29
--- 1/drivers/scsi/virtio_scsi.c
--- 2/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@@ -1007,8 -1002,9 +1007,10 @@@ static int virtscsi_probe(struct virtio
        shost->max_cmd_len = VIRTIO_SCSI_CDB_SIZE;
        shost->nr_hw_queues = num_queues;
  
 +#ifdef CONFIG_BLK_DEV_INTEGRITY
        if (virtio_has_feature(vdev, VIRTIO_SCSI_F_T10_PI)) {
+               int host_prot;
+ 
                host_prot = SHOST_DIF_TYPE1_PROTECTION | SHOST_DIF_TYPE2_PROTECTION |
                            SHOST_DIF_TYPE3_PROTECTION | SHOST_DIX_TYPE1_PROTECTION |
                            SHOST_DIX_TYPE2_PROTECTION | SHOST_DIX_TYPE3_PROTECTION;