drivers/vhost: remove depends on CONFIG_EXPERIMENTAL

The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
while now and is almost always enabled by default. As agreed during the
Linux kernel summit, remove it from any "depends on" lines in Kconfigs.

Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig
index 202bba6c997cce61eb116fc74db8e842454ce1f4..bf243177ffe1857df97048ce1f67b1fb385d7f5e 100644 (file)
--- a/drivers/vhost/Kconfig
+++ b/drivers/vhost/Kconfig
@@ -1,6 +1,6 @@
 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)
        ---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 --git a/drivers/vhost/Kconfig.tcm b/drivers/vhost/Kconfig.tcm
index a9c6f76e3208f0a7dd6c2f544fdc04d78734908c..7e3aa28d999e06a3410ab9f86cc23117ea91f819 100644 (file)
--- a/drivers/vhost/Kconfig.tcm
+++ b/drivers/vhost/Kconfig.tcm
@@ -1,6 +1,6 @@
 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
        default n
        ---help---
        Say M here to enable the TCM_VHOST fabric module for use with virtio-scsi guests