linux-next: manual merge of the driver-core tree with the virtiotree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the driver-core tree got conflicts in
drivers/vhost/Kconfig and drivers/vhost/Kconfig.tcm between commit
4d8dc8b44748 ("vringh: host-side implementation of virtio rings") from
the virtio tree and commit 43893cbefc1b ("drivers/vhost: remove depends
on CONFIG_EXPERIMENTAL") from the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/vhost/Kconfig
index 613b074,bf24317..0000000
--- a/drivers/vhost/Kconfig
+++ b/drivers/vhost/Kconfig
@@@ -1,7 -1,6 +1,7 @@@
  config VHOST_NET
- 	tristate "Host kernel accelerator for virtio net (EXPERIMENTAL)"
- 	depends on NET && EVENTFD && (TUN || !TUN) && (MACVTAP || !MACVTAP) && EXPERIMENTAL
+ 	tristate "Host kernel accelerator for virtio net"
+ 	depends on NET && EVENTFD && (TUN || !TUN) && (MACVTAP || !MACVTAP)
 +	select VHOST_RING
  	---help---
  	  This kernel module can be loaded in host kernel to accelerate
  	  guest networking with virtio_net. Not to be confused with virtio_net
diff --cc drivers/vhost/Kconfig.tcm
index 0218f77,7e3aa28..0000000
--- a/drivers/vhost/Kconfig.tcm
+++ b/drivers/vhost/Kconfig.tcm
@@@ -1,7 -1,6 +1,7 @@@
  config TCM_VHOST
- 	tristate "TCM_VHOST fabric module (EXPERIMENTAL)"
- 	depends on TARGET_CORE && EVENTFD && EXPERIMENTAL && m
+ 	tristate "TCM_VHOST fabric module"
+ 	depends on TARGET_CORE && EVENTFD && m
 +	select VHOST_RING
  	default n
  	---help---
  	Say M here to enable the TCM_VHOST fabric module for use with virtio-scsi guests

Attachment: pgp00000.pgp
Description: PGP signature