• Linus Torvalds's avatar
    Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · d1a343a0
    Linus Torvalds authored
    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
    d1a343a0