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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 20 Feb 2013 15:25:07 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rusty Russell <rusty@...tcorp.com.au>,
	Kees Cook <keescook@...omium.org>
Subject: linux-next: manual merge of the driver-core tree with the virtio
 tree

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@...b.auug.org.au

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

Content of type "application/pgp-signature" skipped