From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Sep 2015 16:28:20 +0000 (-0700)
Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
X-Git-Tag: Ubuntu-5.2.0-15.16~10611
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=00ade1f553e3b947cd26228392ee47d6f0f550e1;p=mirror_ubuntu-eoan-kernel.git

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
---

00ade1f553e3b947cd26228392ee47d6f0f550e1