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 18bce371ae Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux ... * 'for-2.6.38' of git://linux-nfs.org/~bfields/linux: (62 commits) nfsd4: fix callback restarting nfsd: break lease on unlink, link, and rename nfsd4: break lease on nfsd setattr nfsd: don't support msnfs export option nfsd4: initialize cb_per_client nfsd4: allow restarting callbacks nfsd4: simplify nfsd4_cb_prepare nfsd4: give out delegations more quickly in 4.1 case nfsd4: add helper function to run callbacks nfsd4: make sure sequence flags are set after destroy_session nfsd4: re-probe callback on connection loss nfsd4: set sequence flag when backchannel is down nfsd4: keep finer-grained callback status rpc: allow xprt_class->setup to return a preexisting xprt rpc: keep backchannel xprt as long as server connection rpc: move sk_bc_xprt to svc_xprt nfsd4: allow backchannel recovery nfsd4: support BIND_CONN_TO_SESSION nfsd4: modify session list under cl_lock Documentation: fl_mylease no longer exists ... Fix up conflicts in fs/nfsd/vfs.c with the vfs-scale work. The vfs-scale work touched some msnfs cases, and this merge removes support for that entirely, so the conflict was trivial to resolve.		14 years ago
..
Makefile	Net: sunrpc: auth_gss: Makefile: Remove deprecated kbuild goal definitions	14 years ago
auth_gss.c	SUNRPC: New xdr_streams XDR decoder API	14 years ago
gss_generic_token.c	net: return operator cleanup	15 years ago
gss_krb5_crypto.c	net/sunrpc/auth_gss/gss_krb5_crypto.c: Use normal negative error value return	14 years ago
gss_krb5_keys.c	NFS: Don't use GFP_KERNEL in rpcsec_gss downcalls	15 years ago
gss_krb5_mech.c	Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6	14 years ago
gss_krb5_seal.c	gss_krb5: Add support for rc4-hmac encryption	15 years ago
gss_krb5_seqnum.c	net: return operator cleanup	15 years ago
gss_krb5_unseal.c	gss_krb5: Add support for rc4-hmac encryption	15 years ago
gss_krb5_wrap.c	gss_krb5: Add support for rc4-hmac encryption	15 years ago
gss_mech_switch.c	net: return operator cleanup	15 years ago
svcauth_gss.c	net: sunrpc: kill unused macros	14 years ago