diff --git a/[refs] b/[refs] index 64145517bf88..a0a4e4563309 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5eff1a3412f6d75bf28f423c5015ece8055407a +refs/heads/master: b3edc2bc19b4856c705f4aea3f5472970b99f386 diff --git a/trunk/fs/nfs/Kconfig b/trunk/fs/nfs/Kconfig index a43d07e7b924..d55f3f5371b2 100644 --- a/trunk/fs/nfs/Kconfig +++ b/trunk/fs/nfs/Kconfig @@ -61,8 +61,8 @@ config NFS_V3_ACL If unsure, say N. config NFS_V4 - bool "NFS client support for NFS version 4 (EXPERIMENTAL)" - depends on NFS_FS && EXPERIMENTAL + bool "NFS client support for NFS version 4" + depends on NFS_FS select RPCSEC_GSS_KRB5 help This option enables support for version 4 of the NFS protocol @@ -72,7 +72,7 @@ config NFS_V4 space programs which can be found in the Linux nfs-utils package, available from http://linux-nfs.org/. - If unsure, say N. + If unsure, say Y. config NFS_V4_1 bool "NFS client support for NFSv4.1 (DEVELOPER ONLY)"