summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2012-10-23 13:03:38 -0700
committerDavid Teigland <teigland@redhat.com>2012-11-01 15:27:24 -0500
commita3de56bdb980c63b01662cac05d430db60ff4374 (patch)
tree458258313539c715a1ab472f7abe710d2bc72eea /fs
parenteeee2b5fe1a9db15d3160da8048d9b89108753bf (diff)
downloadlinux-a3de56bdb980c63b01662cac05d430db60ff4374.tar.bz2
fs/dlm: remove CONFIG_EXPERIMENTAL
This 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. CC: Christine Caulfield <ccaulfie@redhat.com> Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/dlm/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index 1897eb1b4b6a..e4242c3f8486 100644
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -1,6 +1,6 @@
menuconfig DLM
tristate "Distributed Lock Manager (DLM)"
- depends on EXPERIMENTAL && INET
+ depends on INET
depends on SYSFS && CONFIGFS_FS && (IPV6 || IPV6=n)
select IP_SCTP
help