summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2013-01-16 18:54:14 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-21 14:39:05 -0800
commitf987c902575b5ee7397feb7d5568486b975a0589 (patch)
treea24fdfe78b32519b6b37fd8e7f6aa0c816a5ec76
parent03edef0fea40ae003dd0d4cb337070913265e387 (diff)
downloadkernel-common-f987c902575b5ee7397feb7d5568486b975a0589.tar.gz
kernel-common-f987c902575b5ee7397feb7d5568486b975a0589.tar.bz2
kernel-common-f987c902575b5ee7397feb7d5568486b975a0589.zip
fs/nfsd: 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. CC: "J. Bruce Fields" <bfields@fieldses.org> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/nfsd/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig
index 8df1ea4a6ff9..430b6872806f 100644
--- a/fs/nfsd/Kconfig
+++ b/fs/nfsd/Kconfig
@@ -65,8 +65,8 @@ config NFSD_V3_ACL
If unsure, say N.
config NFSD_V4
- bool "NFS server support for NFS version 4 (EXPERIMENTAL)"
- depends on NFSD && PROC_FS && EXPERIMENTAL
+ bool "NFS server support for NFS version 4"
+ depends on NFSD && PROC_FS
select NFSD_V3
select FS_POSIX_ACL
select SUNRPC_GSS