From: Linus Torvalds Date: Mon, 3 Jun 2019 17:04:05 +0000 (-0700) Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f340208fe27319b1420bf19e96f9cf8eec85cccc;p=linux.git 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() --- f340208fe27319b1420bf19e96f9cf8eec85cccc