From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Mar 2016 19:07:32 +0000 (-0800)
Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f4bd9822080ece335663245c8520b146d9e1bdad;p=linux-beck.git

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

f4bd9822080ece335663245c8520b146d9e1bdad