You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 419f431949 Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux ... Pull the rest of the nfsd commits from Bruce Fields: "... and then I cherry-picked the remainder of the patches from the head of my previous branch" This is the rest of the original nfsd branch, rebased without the delegation stuff that I thought really needed to be redone. I don't like rebasing things like this in general, but in this situation this was the lesser of two evils. * 'for-3.5' of git://linux-nfs.org/~bfields/linux: (50 commits) nfsd4: fix, consolidate client_has_state nfsd4: don't remove rebooted client record until confirmation nfsd4: remove some dprintk's and a comment nfsd4: return "real" sequence id in confirmed case nfsd4: fix exchange_id to return confirm flag nfsd4: clarify that renewing expired client is a bug nfsd4: simpler ordering of setclientid_confirm checks nfsd4: setclientid: remove pointless assignment nfsd4: fix error return in non-matching-creds case nfsd4: fix setclientid_confirm same_cred check nfsd4: merge 3 setclientid cases to 2 nfsd4: pull out common code from setclientid cases nfsd4: merge last two setclientid cases nfsd4: setclientid/confirm comment cleanup nfsd4: setclientid remove unnecessary terms from a logical expression nfsd4: move rq_flavor into svc_cred nfsd4: stricter cred comparison for setclientid/exchange_id nfsd4: move principal name into svc_cred nfsd4: allow removing clients not holding state nfsd4: rearrange exchange_id logic to simplify ...		13 years ago
..
auth_gss	Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux	13 years ago
xprtrdma	Merge branch 'for-3.4' of git://linux-nfs.org/~bfields/linux	13 years ago
Kconfig	SUNRPC/NFS: Add Kbuild dependencies for NFS_DEBUG/RPC_DEBUG	13 years ago
Makefile	…
addr.c	SUNRPC: parametrize rpc_uaddr2sockaddr() by network context	13 years ago
auth.c	…
auth_generic.c	userns: Convert group_info values from gid_t to kgid_t.	13 years ago
auth_null.c	…
auth_unix.c	userns: Convert group_info values from gid_t to kgid_t.	13 years ago
backchannel_rqst.c	SUNRPC: Fix a few sparse warnings	13 years ago
bc_svc.c	…
cache.c	net: cleanup unsigned to unsigned int	13 years ago
clnt.c	NFS client updates for Linux 3.5	13 years ago
netns.h	SUNRPC: create GSS auth cache per network namespace	13 years ago
rpc_pipe.c	NFS client updates for Linux 3.5	13 years ago
rpcb_clnt.c	Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux	13 years ago
sched.c	SUNRPC: We must not use list_for_each_entry_safe() in rpc_wake_up()	13 years ago
socklib.c	sunrpc: remove the second argument of k[un]map_atomic()	13 years ago
stats.c	SUNRPC: Use RCU to dereference the rpc_clnt.cl_xprt field	13 years ago
sunrpc.h	SUNRPC: subscribe RPC clients to pipefs notifications	13 years ago
sunrpc_syms.c	SUNRPC: register PipeFS file system after pernet sybsystem	13 years ago
svc.c	Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux	13 years ago
svc_xprt.c	Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux	13 years ago
svcauth.c	…
svcauth_unix.c	Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux	13 years ago
svcsock.c	net: Convert net_ratelimit uses to net_<level>_ratelimited	13 years ago
sysctl.c	SUNRPC: make SUNPRC clients list per network namespace context	13 years ago
timer.c	net: cleanup unsigned to unsigned int	13 years ago
xdr.c	net: cleanup unsigned to unsigned int	13 years ago
xprt.c	NFS client updates for Linux 3.5	13 years ago
xprtsock.c	sunrpc: skip portmap calls on sessions backchannel	13 years ago