diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-18 16:28:20 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-18 16:28:20 (GMT) |
| commit | 00ade1f553e3b947cd26228392ee47d6f0f550e1 (patch) | |
| tree | 103650aae51d14e271542e068b7c89fec0cf4387 /net/tipc | |
| parent | 3ae839454e77cdc87d499a4bfd0932dec5763b55 (diff) | |
| parent | ad2aa04218de9bd734d593adb0ac59854ec0cb68 (diff) | |
| download | linux-00ade1f553e3b947cd26228392ee47d6f0f550e1.tar.xz | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio fixes and cleanups from Michael Tsirkin:
"This fixes the virtio-test tool, and improves the error handling for
virtio-ccw"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
virtio/s390: handle failures of READ_VQ_CONF ccw
tools/virtio: propagate V=X to kernel build
vhost: move features to core
tools/virtio: fix build after 4.2 changes
Diffstat (limited to 'net/tipc')
0 files changed, 0 insertions, 0 deletions