Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Mar 2016 19:07:32 +0000 (11:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Mar 2016 19:07:32 +0000 (11:07 -0800)
commitf4bd9822080ece335663245c8520b146d9e1bdad
tree5718c3b84741c97b1aba4d777a9ef88f37a9a6fd
parent52ad12966b0217a6dcf782cc2516061343911c0d
parente1f33be9186363da7955bcb5f0b03e6685544c50
Merge tag 'for_linus' of git://git./linux/kernel/git/mst/vhost

Pull minor virtio/vhost fixes from Michael Tsirkin:
 "This fixes two minor bugs: error handling in vhost, and capability
  processing in virtio"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost: fix error path in vhost_init_used()
  virtio-pci: read the right virtio_pci_notify_cap field