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
Showing
- Documentation/feature-removal-schedule.txt 10 additions, 0 deletionsDocumentation/feature-removal-schedule.txt
- fs/Makefile 1 addition, 4 deletionsfs/Makefile
- fs/compat.c 1 addition, 1 deletionfs/compat.c
- fs/lockd/host.c 1 addition, 0 deletionsfs/lockd/host.c
- fs/lockd/mon.c 1 addition, 0 deletionsfs/lockd/mon.c
- fs/lockd/svc.c 1 addition, 1 deletionfs/lockd/svc.c
- fs/lockd/svc4proc.c 0 additions, 2 deletionsfs/lockd/svc4proc.c
- fs/lockd/svclock.c 21 additions, 10 deletionsfs/lockd/svclock.c
- fs/lockd/svcproc.c 0 additions, 2 deletionsfs/lockd/svcproc.c
- fs/nfs/callback.c 2 additions, 2 deletionsfs/nfs/callback.c
- fs/nfs/client.c 1 addition, 0 deletionsfs/nfs/client.c
- fs/nfs/dns_resolve.c 3 additions, 3 deletionsfs/nfs/dns_resolve.c
- fs/nfs/mount_clnt.c 2 additions, 0 deletionsfs/nfs/mount_clnt.c
- fs/nfsd/Kconfig 12 additions, 0 deletionsfs/nfsd/Kconfig
- fs/nfsd/export.c 52 additions, 21 deletionsfs/nfsd/export.c
- fs/nfsd/nfs4callback.c 139 additions, 105 deletionsfs/nfsd/nfs4callback.c
- fs/nfsd/nfs4idmap.c 11 additions, 94 deletionsfs/nfsd/nfs4idmap.c
- fs/nfsd/nfs4proc.c 5 additions, 2 deletionsfs/nfsd/nfs4proc.c
- fs/nfsd/nfs4state.c 311 additions, 182 deletionsfs/nfsd/nfs4state.c
- fs/nfsd/nfs4xdr.c 12 additions, 6 deletionsfs/nfsd/nfs4xdr.c
Please register or sign in to comment