From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Jul 2011 05:49:19 +0000 (-0700)
Subject: Merge branch 'for-3.1' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: firefly_0821_release~3680^2~4931
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=2dad3206db5c3832cde1f58650027fea3ff7adf3;p=firefly-linux-kernel-4.4.55.git

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
---

2dad3206db5c3832cde1f58650027fea3ff7adf3
diff --cc Documentation/feature-removal-schedule.txt
index 89e46d3dc642,d43900c9ede2..aca4f8235969
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -491,16 -491,16 +491,6 @@@ Who:	Wey-Yi Guy <wey-yi.w.guy@intel.com
  
  ----------------------------
  
- What:   access to nfsd auth cache through sys_nfsservctl or '.' files
-         in the 'nfsd' filesystem.
- When:   3.0
- Why:    This is a legacy interface which have been replaced by a more
-         dynamic cache.  Continuing to maintain this interface is an
-         unnecessary burden.
- Who:    NeilBrown <neilb@suse.de>
 -What:	cancel_rearming_delayed_work[queue]()
 -When:	2.6.39
 -
 -Why:	The functions have been superceded by cancel_delayed_work_sync()
 -	quite some time ago.  The conversion is trivial and there is no
 -	in-kernel user left.
 -Who:	Tejun Heo <tj@kernel.org>
--
------------------------------
--
  What:	Legacy, non-standard chassis intrusion detection interface.
  When:	June 2011
  Why:	The adm9240, w83792d and w83793 hardware monitoring drivers have