Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhostmaster
commit1b88accf6a659c46d5c8e68912896f112bf882bb
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Mar 2018 01:49:33 +0000 (7 17:49 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Mar 2018 01:49:33 +0000 (7 17:49 -0800)
treed3ef4efd224430eaf1870b146eaa73a43f8ee603
parent851710a8096131129ad1da79a47d385c4926d114
parente82df670235138575b37ff0ec24412a471efd97f
Merge tag 'for_linus' of git://git./linux/kernel/git/mst/vhost

Pull virtio bugfix from Michael Tsirkin:
 "A bugfix for error handling in virtio"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio_ring: fix num_free handling in error case