From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 Mar 2018 01:49:33 +0000 (-0800)
Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
X-Git-Tag: v4.16-rc5~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b88accf6a659c46d5c8e68912896f112bf882bb;p=thirdparty%2Fkernel%2Fstable.git

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/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
---

1b88accf6a659c46d5c8e68912896f112bf882bb