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


Trivial merge