Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Aug 2017 00:40:03 +0000 (17:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Aug 2017 00:40:03 +0000 (17:40 -0700)
commit17e34c4fd0be14e989b08734b302cd357126fe2d
treee6d60bd49488d2a5b4afb9a3884a1097c6504a1f
parent42e6d5e5ee05a0a4fa6f71ffeeafc367a1483740
parentba74b6f7fcc07355d087af6939712eed4a454821
Merge tag 'for_linus' of git://git./linux/kernel/git/mst/vhost

Pull virtio fixes from Michael Tsirkin:
 "Fixes two obvious bugs in virtio pci"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio_pci: fix cpu affinity support
  virtio_blk: fix incorrect message when disk is resized