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

Pull virtio/vhost updates from Michael Tsirkin:

 - new vsock device support in host and guest

 - platform IOMMU support in host and guest, including compatibility
   quirks for legacy systems.

 - misc fixes and cleanups.

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  VSOCK: Use kvfree()
  vhost: split out vringh Kconfig
  vhost: detect 32 bit integer wrap around
  vhost: new device IOTLB API
  vhost: drop vringh dependency
  vhost: convert pre sorted vhost memory array to interval tree
  vhost: introduce vhost memory accessors
  VSOCK: Add Makefile and Kconfig
  VSOCK: Introduce vhost_vsock.ko
  VSOCK: Introduce virtio_transport.ko
  VSOCK: Introduce virtio_vsock_common.ko
  VSOCK: defer sock removal to transports
  VSOCK: transport-specific vsock_transport functions
  vhost: drop vringh dependency
  vop: pull in vhost Kconfig
  virtio: new feature to detect IOMMU device quirk
  balloon: check the number of available pages in leak balloon
  vhost: lockless enqueuing
  vhost: simplify work flushing

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/vhost/net.c
index e032ca397371099e97e97f7ddff0ae8bd1a41491,0965f869dc578c8b0da1d086e7d40b4bf1de8bcc..5dc128a8da83e5c724dbd1d8748fa0db2a300d7a
--- 1/drivers/vhost/net.c
--- 2/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@@ -652,8 -616,11 +656,12 @@@ static void handle_rx(struct vhost_net 
        sock = vq->private_data;
        if (!sock)
                goto out;
+ 
+       if (!vq_iotlb_prefetch(vq))
+               goto out;
+ 
        vhost_disable_notify(&net->dev, vq);
 +      vhost_net_disable_vq(net, vq);
  
        vhost_hlen = nvq->vhost_hlen;
        sock_hlen = nvq->sock_hlen;

diff --cc drivers/virtio/virtio_balloon.c
Simple merge

diff --cc include/uapi/linux/Kbuild
index c44747c0796a26e08ad6c847cf2ef0b4e75c578c,3cf0116d9c2bc27319207f3f5f05c278c6d37940..185f8ea2702fc6b85335647d7076115c694cdfba
--- 1/include/uapi/linux/Kbuild
--- 2/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@@ -454,9 -453,9 +454,10 @@@ header-y += virtio_ring.
  header-y += virtio_rng.h
  header-y += virtio_scsi.h
  header-y += virtio_types.h
+ header-y += virtio_vsock.h
  header-y += vm_sockets.h
  header-y += vt.h
 +header-y += vtpm_proxy.h
  header-y += wait.h
  header-y += wanrouter.h
  header-y += watchdog.h