Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Nov 2019 21:02:18 +0000 (13:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Nov 2019 21:02:18 +0000 (13:02 -0800)
commit6b8a794678763130b7e7d049985008641dc494e8
tree90a81b9869f8a203dea73226c49ada66e92664bb
parent2027cabe6afea5d471401ec704b65ce18f958fdc
parentc9a6820fc0da2603be3054ee7590eb9f350508a7
Merge tag 'for_linus' of git://git./linux/kernel/git/mst/vhost

Pull last minute virtio bugfixes from Michael Tsirkin:
 "Minor bugfixes all over the place"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio_balloon: fix shrinker count
  virtio_balloon: fix shrinker scan number of pages
  virtio_console: allocate inbufs in add_port() only if it is needed
  virtio_ring: fix return code on DMA mapping fails