From: Kees Cook <keescook@chromium.org>
Date: Tue, 23 Oct 2012 20:03:38 +0000 (-0700)
Subject: fs/dlm: remove CONFIG_EXPERIMENTAL
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a3de56bdb980c63b01662cac05d430db60ff4374;p=linux.git

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>
---

diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index 1897eb1b4b6ae..e4242c3f84860 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