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 1db772216f Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux ... Pull nfsd changes from J Bruce Fields: "Highlights include: - Some more DRC cleanup and performance work from Jeff Layton - A gss-proxy upcall from Simo Sorce: currently krb5 mounts to the server using credentials from Active Directory often fail due to limitations of the svcgssd upcall interface. This replacement lifts those limitations. The existing upcall is still supported for backwards compatibility. - More NFSv4.1 support: at this point, if a user with a current client who upgrades from 4.0 to 4.1 should see no regressions. In theory we do everything a 4.1 server is required to do. Patches for a couple minor exceptions are ready for 3.11, and with those and some more testing I'd like to turn 4.1 on by default in 3.11." Fix up semantic conflict as per Stephen Rothwell and linux-next: Commit 030d794bf4 ("SUNRPC: Use gssproxy upcall for server RPCGSS authentication") adds two new users of "PDE(inode)->data", but we're supposed to use "PDE_DATA(inode)" instead since commit d9dda78bad ("procfs: new helper - PDE_DATA(inode)"). The old PDE() macro is no longer available since commit c30480b92c ("proc: Make the PROC_I() and PDE() macros internal to procfs") * 'for-3.10' of git://linux-nfs.org/~bfields/linux: (60 commits) NFSD: SECINFO doesn't handle unsupported pseudoflavors correctly NFSD: Simplify GSS flavor encoding in nfsd4_do_encode_secinfo() nfsd: make symbol nfsd_reply_cache_shrinker static svcauth_gss: fix error return code in rsc_parse() nfsd4: don't remap EISDIR errors in rename svcrpc: fix gss-proxy to respect user namespaces SUNRPC: gssp_procedures[] can be static SUNRPC: define {create,destroy}_use_gss_proxy_proc_entry in !PROC case nfsd4: better error return to indicate SSV non-support nfsd: fix EXDEV checking in rename SUNRPC: Use gssproxy upcall for server RPCGSS authentication. SUNRPC: Add RPC based upcall mechanism for RPCGSS auth SUNRPC: conditionally return endtime from import_sec_context SUNRPC: allow disabling idle timeout SUNRPC: attempt AF_LOCAL connect on setup nfsd: Decode and send 64bit time values nfsd4: put_client_renew_locked can be static nfsd4: remove unused macro nfsd4: remove some useless code nfsd4: implement SEQ4_STATUS_RECALLABLE_STATE_REVOKED ...		12 years ago
..
auth_gss	Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux	12 years ago
xprtrdma	…
Kconfig	Merge branch 'rpcsec_gss-from_cel' into linux-next	12 years ago
Makefile	…
addr.c	…
auth.c	SUNRPC: Don't recognize RPC_AUTH_MAXFLAVOR	12 years ago
auth_generic.c	…
auth_null.c	…
auth_unix.c	…
backchannel_rqst.c	…
bc_svc.c	…
cache.c	Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux	12 years ago
clnt.c	Merge branch 'nfs-for-next' of git://linux-nfs.org/~trondmy/nfs-2.6 into for-3.10	12 years ago
netns.h	SUNRPC: Use gssproxy upcall for server RPCGSS authentication.	12 years ago
rpc_pipe.c	fs: Readd the fs module aliases.	12 years ago
rpcb_clnt.c	…
sched.c	SUNRPC: Add barriers to ensure read ordering in rpc_wake_up_task_queue_locked	12 years ago
socklib.c	…
stats.c	procfs: new helper - PDE_DATA(inode)	12 years ago
sunrpc.h	…
sunrpc_syms.c	…
svc.c	…
svc_xprt.c	…
svcauth.c	…
svcauth_unix.c	…
svcsock.c	…
sysctl.c	…
timer.c	…
xdr.c	…
xprt.c	SUNRPC: allow disabling idle timeout	12 years ago
xprtsock.c	NFS client bugfixes and cleanups for 3.10	12 years ago