Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / fs / nfsd / Kconfig

diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig
index f994e75..7339515 100644 (file)
--- a/fs/nfsd/Kconfig
+++ b/fs/nfsd/Kconfig
@@ -71,6 +71,7 @@ config NFSD_V4
        select FS_POSIX_ACL
        select SUNRPC_GSS
        select CRYPTO
+       select GRACE_PERIOD
        help
          This option enables support in your system's NFS server for
          version 4 of the NFS protocol (RFC 3530).
@@ -94,9 +95,6 @@ config NFSD_V4_SECURITY_LABEL
        If you do not wish to enable fine-grained security labels SELinux or
        Smack policies on NFSv4 files, say N.
 
-       WARNING: there is still a chance of backwards-incompatible protocol changes.
-       For now we recommend "Y" only for developers and testers.
-
 config NFSD_FAULT_INJECTION
        bool "NFS server manual fault injection"
        depends on NFSD_V4 && DEBUG_KERNEL