diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 01:49:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 01:49:19 -0400 |
| commit | 2dad3206db5c3832cde1f58650027fea3ff7adf3 (patch) | |
| tree | 96314a554afdab5904a939793156d4ae23ec11c1 /arch | |
| parent | 84635d68be4b846ba984a89f386524153330c597 (diff) | |
| parent | 0c12eaffdf09466f36a9ffe970dda8f4aeb6efc0 (diff) | |
Merge branch 'for-3.1' of git://linux-nfs.org/~bfields/linux
* 'for-3.1' of git://linux-nfs.org/~bfields/linux:
nfsd: don't break lease on CLAIM_DELEGATE_CUR
locks: rename lock-manager ops
nfsd4: update nfsv4.1 implementation notes
nfsd: turn on reply cache for NFSv4
nfsd4: call nfsd4_release_compoundargs from pc_release
nfsd41: Deny new lock before RECLAIM_COMPLETE done
fs: locks: remove init_once
nfsd41: check the size of request
nfsd41: error out when client sets maxreq_sz or maxresp_sz too small
nfsd4: fix file leak on open_downgrade
nfsd4: remember to put RW access on stateid destruction
NFSD: Added TEST_STATEID operation
NFSD: added FREE_STATEID operation
svcrpc: fix list-corrupting race on nfsd shutdown
rpc: allow autoloading of gss mechanisms
svcauth_unix.c: quiet sparse noise
svcsock.c: include sunrpc.h to quiet sparse noise
nfsd: Remove deprecated nfsctl system call and related code.
NFSD: allow OP_DESTROY_CLIENTID to be only op in COMPOUND
Fix up trivial conflicts in Documentation/feature-removal-schedule.txt
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/tile/configs/tilegx_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig index 09f1c7fad8bf..2ad73fb707b9 100644 --- a/arch/tile/configs/tilegx_defconfig +++ b/arch/tile/configs/tilegx_defconfig | |||
| @@ -1479,7 +1479,6 @@ CONFIG_NFS_FSCACHE=y | |||
| 1479 | CONFIG_NFS_USE_KERNEL_DNS=y | 1479 | CONFIG_NFS_USE_KERNEL_DNS=y |
| 1480 | # CONFIG_NFS_USE_NEW_IDMAPPER is not set | 1480 | # CONFIG_NFS_USE_NEW_IDMAPPER is not set |
| 1481 | CONFIG_NFSD=m | 1481 | CONFIG_NFSD=m |
| 1482 | CONFIG_NFSD_DEPRECATED=y | ||
| 1483 | CONFIG_NFSD_V2_ACL=y | 1482 | CONFIG_NFSD_V2_ACL=y |
| 1484 | CONFIG_NFSD_V3=y | 1483 | CONFIG_NFSD_V3=y |
| 1485 | CONFIG_NFSD_V3_ACL=y | 1484 | CONFIG_NFSD_V3_ACL=y |