diff --git a/[refs] b/[refs] index a0a4e4563309..dd1736144506 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3edc2bc19b4856c705f4aea3f5472970b99f386 +refs/heads/master: 3dce9a5c3a39a664e372886ea86c42ae7ae33dfc diff --git a/trunk/fs/nfs/Kconfig b/trunk/fs/nfs/Kconfig index d55f3f5371b2..cc1bb33b59b8 100644 --- a/trunk/fs/nfs/Kconfig +++ b/trunk/fs/nfs/Kconfig @@ -75,13 +75,13 @@ config NFS_V4 If unsure, say Y. config NFS_V4_1 - bool "NFS client support for NFSv4.1 (DEVELOPER ONLY)" + bool "NFS client support for NFSv4.1 (EXPERIMENTAL)" depends on NFS_V4 && EXPERIMENTAL help This option enables support for minor version 1 of the NFSv4 protocol (draft-ietf-nfsv4-minorversion1) in the kernel's NFS client. - Unless you're an NFS developer, say N. + If unsure, say N. config ROOT_NFS bool "Root file system on NFS"