Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Sep 2015 16:28:20 +0000 (09:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Sep 2015 16:28:20 +0000 (09:28 -0700)
commit00ade1f553e3b947cd26228392ee47d6f0f550e1
tree103650aae51d14e271542e068b7c89fec0cf4387
parent3ae839454e77cdc87d499a4bfd0932dec5763b55
parentad2aa04218de9bd734d593adb0ac59854ec0cb68
Merge tag 'for_linus' of git://git./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
drivers/vhost/scsi.c