diff --git a/[refs] b/[refs] index 06978817301b..deabe4e7f4f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03edef0fea40ae003dd0d4cb337070913265e387 +refs/heads/master: f987c902575b5ee7397feb7d5568486b975a0589 diff --git a/trunk/fs/nfsd/Kconfig b/trunk/fs/nfsd/Kconfig index 8df1ea4a6ff9..430b6872806f 100644 --- a/trunk/fs/nfsd/Kconfig +++ b/trunk/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