diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 14:33:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 14:33:41 -0700 |
| commit | 3e1f900bff40460d7bbab0ccd1a9efc3c70aee49 (patch) | |
| tree | d0e2138ff61bdc9d1bd5b7ae5a1e75267d709afc /fs/Kconfig | |
| parent | 12795067cfa595434be0236b102a8eb20d578741 (diff) | |
| parent | 0a87cf128f3d3bc6aa7b1040e73109c974ed875a (diff) | |
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
* git://git.linux-nfs.org/pub/linux/nfs-2.6:
NFSv4: handle lack of clientaddr in option string
NFSv4: debug print ntohl(status) in nfs client callback xdr code
SUNRPC: Clean up the sillyrename code
NFS: Introduce struct nfs_removeargs+nfs_removeres
NFS: Use dentry->d_time to store the parent directory verifier.
SUNRPC: move bkl locking and xdr proc invocation into a common helper
NFSv4: Fix the nfsv4 readlink reply buffer alignment
NFSv4: Fix the readdir reply buffer alignment
NFSv4: More NFSv4 xdr cleanups
NFSv4: Try to recover from getfh failures in nfs4_xdr_dec_open
NFSv4: 'constify' lookup arguments.
NFSv4: Don't fail nfs4_xdr_dec_open if decode_restorefh() failed
NFSv4: Fix open state recovery
NFSD/SUNRPC: Fix the automatic selection of RPCSEC_GSS
Diffstat (limited to 'fs/Kconfig')
| -rw-r--r-- | fs/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index 6a649902c5a..58a0650293e 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -1674,7 +1674,7 @@ config NFSD_V3_ACL config NFSD_V4 bool "Provide NFSv4 server support (EXPERIMENTAL)" - depends on NFSD_V3 && EXPERIMENTAL + depends on NFSD && NFSD_V3 && EXPERIMENTAL select RPCSEC_GSS_KRB5 help If you would like to include the NFSv4 server as well as the NFSv2 |