Please consider these for 3.10. With the exception of 15/15, similar or the same patches have been posted here before. The NFSv3 MNT changes we discussed at the pub will appear soon. --- Chuck Lever (15): NFS: Use "krb5i" to establish NFSv4 state whenever possible NFS: Try AUTH_UNIX when PUTROOTFH gets NFS4ERR_WRONGSEC NFS: Use static list of security flavors during root FH lookup recovery NFS: Avoid PUTROOTFH when managing leases NFS: Clean up nfs4_proc_get_rootfh NFS: Handle missing rpc.gssd when looking up root FH SUNRPC: Remove EXPORT_SYMBOL_GPL() from GSS mech switch SUNRPC: Make gss_mech_get() static SUNRPC: Refactor nfsd4_do_encode_secinfo() SUNRPC: Consider qop when looking up pseudoflavors SUNRPC: Load GSS kernel module by OID SUNRPC: Introduce rpcauth_get_pseudoflavor() SUNRPC: Define rpcsec_gss_info structure NFS: Remove unneeded forward declaration SUNRPC: Missing module alias for auth_rpcgss.ko fs/nfs/nfs4client.c | 2 - fs/nfs/nfs4namespace.c | 43 +++++++----- fs/nfs/nfs4proc.c | 92 ++++++++++++++++---------- fs/nfs/nfs4state.c | 37 +--------- fs/nfs/nfs4xdr.c | 39 ++++------- fs/nfsd/nfs4xdr.c | 24 +++---- include/linux/nfs_xdr.h | 24 +------ include/linux/sunrpc/auth.h | 9 ++ include/linux/sunrpc/gss_api.h | 30 ++++++-- net/sunrpc/Kconfig | 1 net/sunrpc/auth.c | 70 +++++++++++++++++++ net/sunrpc/auth_gss/auth_gss.c | 3 + net/sunrpc/auth_gss/gss_krb5_mech.c | 6 +- net/sunrpc/auth_gss/gss_mech_switch.c | 119 +++++++++++++++++++++++++-------- net/sunrpc/auth_gss/svcauth_gss.c | 4 + 15 files changed, 319 insertions(+), 184 deletions(-) -- Chuck Lever -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html