Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
	drivers/vhost/Makefile

diff --cc drivers/vhost/Kconfig
index 85b773a93a5d1ec4e568ef0db77bd064838f9938,acd8038544c8a6f2a85c47c6a4fa43c07754f38e..80572fa2eeb017c28f5222a1a2c912d0b3e5ca2b
--- 1/drivers/vhost/Kconfig
--- 2/drivers/vhost/Kconfig
+++ b/drivers/vhost/Kconfig
@@@ -12,11 -11,5 +12,12 @@@ config VHOST_NE
  
  if STAGING
  source "drivers/vhost/Kconfig.tcm"
+ source "drivers/vhost/Kconfig.blk"
  endif
 +
 +config VHOST_RING
 +      tristate
 +      ---help---
 +        This option is selected by any driver which needs to access
 +        the host side of a virtio ring.
 +

diff --cc drivers/vhost/Makefile
index 1d37f5e12be619428c3279af45461c0a891aa3dc,1a8a4a557a8ca89a9c85561c8906409feb4f6bfb..369e8729c221ee97059803332f9b95d5e8ae5632
--- 1/drivers/vhost/Makefile
--- 2/drivers/vhost/Makefile
+++ b/drivers/vhost/Makefile
@@@ -2,5 -2,5 +2,7 @@@ obj-$(CONFIG_VHOST_NET) += vhost_net.
  vhost_net-y := vhost.o net.o
  
  obj-$(CONFIG_TCM_VHOST) += tcm_vhost.o
 +
 +obj-$(CONFIG_VHOST_RING) += vringh.o
+ obj-$(CONFIG_VHOST_BLK) += vhost_blk.o
+ vhost_blk-y := blk.o