Linus Torvalds
0d9f9e122c
Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux ...
* 'for-2.6.36' of git://linux-nfs.org/~bfields/linux: (34 commits)
nfsd4: fix file open accounting for RDWR opens
nfsd: don't allow setting maxblksize after svc created
nfsd: initialize nfsd versions before creating svc
net: sunrpc: removed duplicated #include
nfsd41: Fix a crash when a callback is retried
nfsd: fix startup/shutdown order bug
nfsd: minor nfsd read api cleanup
gcc-4.6: nfsd: fix initialized but not read warnings
nfsd4: share file descriptors between stateid's
nfsd4: fix openmode checking on IO using lock stateid
nfsd4: miscellaneous process_open2 cleanup
nfsd4: don't pretend to support write delegations
nfsd: bypass readahead cache when have struct file
nfsd: minor nfsd_svc() cleanup
nfsd: move more into nfsd_startup()
nfsd: just keep single lockd reference for nfsd
nfsd: clean up nfsd_create_serv error handling
nfsd: fix error handling in __write_ports_addxprt
nfsd: fix error handling when starting nfsd with rpcbind down
nfsd4: fix v4 state shutdown error paths
...
2010-08-07 14:24:41 -07:00
SUNRPC: Defer deleting the security context until gss_do_free_ctx()
2010-08-04 08:55:14 -04:00
Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linux
2010-05-19 17:24:54 -07:00
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
Merge branch 'nfs-for-2.6.36' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
2010-08-07 13:19:36 -07:00
SUNRPC: Clean up of rpc_bindcred()
2010-08-04 08:54:08 -04:00
SUNRPC: Move the bound cred to struct rpc_rqst
2010-08-04 08:54:09 -04:00
SUNRPC: Move the bound cred to struct rpc_rqst
2010-08-04 08:54:09 -04:00
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
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-04-11 14:53:53 -07:00
net: sunrpc: removed duplicated #include
2010-08-06 17:05:39 -04:00
SUNRPC: Move the bound cred to struct rpc_rqst
2010-08-04 08:54:09 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2009-04-03 15:24:35 -07:00
SUNRPC: Provide functions for managing universal addresses
2009-08-09 15:09:34 -04:00
sunrpc: Pushdown the bkl from ioctl
2010-05-22 17:44:19 +02:00
kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT_MAX and SHRT_MIN
2010-05-25 08:07:02 -07:00
SUNRPC: Reduce asynchronous RPC task stack usage
2010-08-04 08:54:09 -04:00
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
SUNRPC: Move the task->tk_bytes_sent and tk_rtt to struct rpc_rqst
2010-05-14 15:09:36 -04:00
nfsd41: sunrpc: Added rpc server-side backchannel handling
2009-09-11 15:04:16 -04:00
Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux
2010-08-07 14:24:41 -07:00
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
Merge commit 'v2.6.34-rc6'
2010-05-04 11:29:05 -04:00
net: Move && and || to end of previous line
2009-11-29 16:55:45 -08:00
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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2010-05-20 21:04:44 -07:00
sysctl: Drop & in front of every proc_handler.
2009-11-18 08:37:40 -08:00
SUNRPC: Add documenting comments in net/sunrpc/timer.c
2009-08-09 15:09:47 -04:00
xdr: Add an export for the helper function write_bytes_to_xdr_buf()
2010-05-14 15:09:18 -04:00
SUNRPC: prevent task_cleanup running on freed xprt
2010-08-04 08:54:10 -04:00
SUNRPC: Fix a re-entrancy bug in xs_tcp_read_calldir()
2010-06-22 13:21:18 -04:00
0d9f9e122c