From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 21 Mar 2013 04:34:52 +0000 (+1100)
Subject: Merge remote-tracking branch 'vhost/linux-next'
X-Git-Tag: next-20130321~18
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=674bd00ce2fdec26daacb2f9fe3070f6c1ecf0e2;p=karo-tx-linux.git

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

Conflicts:
	drivers/vhost/Makefile
---

674bd00ce2fdec26daacb2f9fe3070f6c1ecf0e2
diff --cc drivers/vhost/Kconfig
index 85b773a93a5d,acd8038544c8..80572fa2eeb0
--- a/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 1d37f5e12be6,1a8a4a557a8c..369e8729c221
--- a/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