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

diff --combined drivers/vhost/scsi.c
index f114a9dbb48f0ea59718da7fe59a02180da07821,0a5b404b316aac3f38816c82f336bcaa0dfb8862..e25a23692822c16ce26f7a2b9b9f7f96153a6563
--- 1/drivers/vhost/scsi.c
--- 2/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@@ -166,9 -166,7 +166,7 @@@ enum 
  /* Note: can't set VIRTIO_F_VERSION_1 yet, since that implies ANY_LAYOUT. */
  enum {
        VHOST_SCSI_FEATURES = VHOST_FEATURES | (1ULL << VIRTIO_SCSI_F_HOTPLUG) |
-                                              (1ULL << VIRTIO_SCSI_F_T10_PI) |
-                                              (1ULL << VIRTIO_F_ANY_LAYOUT) |
-                                              (1ULL << VIRTIO_F_VERSION_1)
+                                              (1ULL << VIRTIO_SCSI_F_T10_PI)
  };
  
  #define VHOST_SCSI_MAX_TARGET 256
@@@ -1573,9 -1571,9 +1571,9 @@@ static int __init vhost_scsi_register(v
        return misc_register(&vhost_scsi_misc);
  }
  
 -static int vhost_scsi_deregister(void)
 +static void vhost_scsi_deregister(void)
  {
 -      return misc_deregister(&vhost_scsi_misc);
 +      misc_deregister(&vhost_scsi_misc);
  }
  
  static char *vhost_scsi_dump_proto_id(struct vhost_scsi_tport *tport)