Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jun 2018 21:35:02 +0000 (06:35 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jun 2018 21:35:02 +0000 (06:35 +0900)
commit2f3f056685198e9fc76c23bd88fbe2662ab7b044
tree98ee7ade3620cac729ce85434fd85e84e411ea64
parent4c5e8fc62d6a63065eeae80808c498d1dcfea4f4
parent2eb98105f8c7f4b867f7f714a998f5b8c1bb009b
Merge tag 'for_linus' of git://git./linux/kernel/git/mst/vhost

Pull virtio updates from Michael Tsirkin:
 "virtio, vhost: features, fixes

   - PCI virtual function support for virtio

   - DMA barriers for virtio strong barriers

   - bugfixes"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio: update the comments for transport features
  virtio_pci: support enabling VFs
  vhost: fix info leak due to uninitialized memory
  virtio_ring: switch to dma_XX barriers for rpmsg
drivers/vhost/vhost.c
drivers/virtio/virtio_pci_common.c