kernel-ark/fs/lockd
Linus Torvalds 4390110fef 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
2010-10-26 09:55:25 -07:00
..
clntlock.c lockd: Remove BKL from the client 2010-09-22 09:50:35 -04:00
clntproc.c lockd: Remove BKL from the client 2010-09-22 09:50:35 -04:00
grace.c nfsd: common grace period control 2008-10-03 16:19:02 -04:00
host.c sunrpc: Add net to rpc_create_args 2010-10-01 17:18:56 -04:00
Makefile nfsd: common grace period control 2008-10-03 16:19:02 -04:00
mon.c sunrpc: Add net to rpc_create_args 2010-10-01 17:18:56 -04:00
svc4proc.c lockd: Mostly remove BKL from the server 2010-09-22 15:32:58 -04:00
svc.c sunrpc: Add net argument to svc_create_xprt 2010-10-01 17:18:54 -04:00
svclock.c lockd: Mostly remove BKL from the server 2010-09-22 15:32:58 -04:00
svcproc.c lockd: Mostly remove BKL from the server 2010-09-22 15:32:58 -04:00
svcshare.c lockd: fix sparse warning in svcshare.c 2008-04-23 16:13:39 -04:00
svcsubs.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
xdr4.c headers: utsname.h redux 2009-09-23 18:13:10 -07:00
xdr.c headers: utsname.h redux 2009-09-23 18:13:10 -07:00