Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.37' of git://linux-nfs.org/~bfields/linux: (99 commits)
  svcrpc: svc_tcp_sendto XPT_DEAD check is redundant
  svcrpc: no need for XPT_DEAD check in svc_xprt_enqueue
  svcrpc: assume svc_delete_xprt() called only once
  svcrpc: never clear XPT_BUSY on dead xprt
  nfsd4: fix connection allocation in sequence()
  nfsd4: only require krb5 principal for NFSv4.0 callbacks
  nfsd4: move minorversion to client
  nfsd4: delay session removal till free_client
  nfsd4: separate callback change and callback probe
  nfsd4: callback program number is per-session
  nfsd4: track backchannel connections
  nfsd4: confirm only on succesful create_session
  nfsd4: make backchannel sequence number per-session
  nfsd4: use client pointer to backchannel session
  nfsd4: move callback setup into session init code
  nfsd4: don't cache seq_misordered replies
  SUNRPC: Properly initialize sock_xprt.srcaddr in all cases
  SUNRPC: Use conventional switch statement when reclassifying sockets
  sunrpc/xprtrdma: clean up workqueue usage
  sunrpc: Turn list_for_each-s into the ..._entry-s
  ...

Fix up trivial conflicts (two different deprecation notices added in
separate branches) in Documentation/feature-removal-schedule.txt

diff --cc Documentation/feature-removal-schedule.txt
index e833c8c81e691797fd44311c5463714ca1535a94,076a2c02adaf61a7fa34a9b0e5f2f6c14b3d2e68..d2af87ba96e11ed5edc7ac4a81e081cff23ee00c
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -526,12 -564,13 +526,22 @@@ Who:    FUJITA Tomonori <fujita.tomonori@l
  
  ----------------------------
  
 -      
 +What: iwlwifi disable_hw_scan module parameters
 +When: 2.6.40
 +Why:  Hareware scan is the prefer method for iwlwifi devices for
 +      scanning operation. Remove software scan support for all the
 +      iwlwifi devices.
 +
 +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:   2.6.40
+ 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>
+ 
+ ----------------------------

diff --cc fs/compat.c
Simple merge

diff --cc fs/nfs/client.c
Simple merge

diff --cc fs/nfs/mount_clnt.c
Simple merge

diff --cc fs/nfsd/Kconfig
Simple merge

diff --cc fs/nfsd/nfs4state.c
Simple merge

diff --cc fs/nfsd/nfsctl.c
Simple merge

diff --cc include/linux/nfs4.h
Simple merge

diff --cc include/linux/sunrpc/clnt.h
Simple merge

diff --cc net/socket.c
Simple merge

diff --cc net/sunrpc/auth.c
Simple merge

diff --cc net/sunrpc/cache.c
index 7dce81a926c5e000b1444d2909fad940b93d0cf4,ba61d0fa4b8036552a89c3fe12592e08df8c9145..e433e7580e27b221eff94d8b95ceaea703440618
--- 1/net/sunrpc/cache.c
--- 2/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@@ -1435,11 -1540,12 +1534,13 @@@ static const struct file_operations cac
        .read           = read_flush_procfs,
        .write          = write_flush_procfs,
        .release        = release_flush_procfs,
 +      .llseek         = no_llseek,
  };
  
- static void remove_cache_proc_entries(struct cache_detail *cd)
+ static void remove_cache_proc_entries(struct cache_detail *cd, struct net *net)
  {
+       struct sunrpc_net *sn;
+ 
        if (cd->u.procfs.proc_ent == NULL)
                return;
        if (cd->u.procfs.flush_ent)

diff --cc net/sunrpc/clnt.c
Simple merge

diff --cc net/sunrpc/rpcb_clnt.c
Simple merge

diff --cc net/sunrpc/xprtsock.c
Simple merge