Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Jun 2019 17:04:05 +0000 (10:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Jun 2019 17:04:05 +0000 (10:04 -0700)
commitf340208fe27319b1420bf19e96f9cf8eec85cccc
treeaae1f64b9b21b6812a309abed7df3d20ccf6f5ac
parentf2c7c76c5d0a443053e94adb9f0918fa2fb85c3a
parentc1ea02f15ab5efb3e93fc3144d895410bf79fcf2
Merge tag 'for_linus' of git://git./linux/kernel/git/mst/vhost

Pull virtio fixes from Michael Tsirkin:
 "Several fixes, some of them for CVEs"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost: scsi: add weight support
  vhost: vsock: add weight support
  vhost_net: fix possible infinite loop
  vhost: introduce vhost_exceeds_weight()
  virtio: Fix indentation of VIRTIO_MMIO
  virtio: add unlikely() to WARN_ON_ONCE()