| commit | f4bd9822080ece335663245c8520b146d9e1bdad | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 03 11:07:32 2016 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 03 11:07:32 2016 -0800 |
| tree | 5718c3b84741c97b1aba4d777a9ef88f37a9a6fd | |
| parent | 52ad12966b0217a6dcf782cc2516061343911c0d [diff] | |
| parent | e1f33be9186363da7955bcb5f0b03e6685544c50 [diff] |
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