git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	J. Bruce Fields <bfields@redhat.com>
	Mon, 29 Apr 2013 18:03:30 +0000 (14:03 -0400)
committer	J. Bruce Fields <bfields@redhat.com>
	Mon, 29 Apr 2013 20:23:34 +0000 (16:23 -0400)
commit	6b0a1582fa07720a9a07f27e25b1d380b3fe1601
tree	cf5fdd96cccb3a89f4e0dea895775eb7c428c533	tree \| snapshot
parent	6cbfc9019ccbb9eafcf4d93cbcbb665a2bf47a52	commit \| diff
parent	79adce8077e138647e90fe73831514b67635641f	commit \| diff

Merge branch 'nfs-for-next' of git://linux-nfs.org/~trondmy/nfs-2.6 into for-3.10

Note conflict: Chuck's patches modified (and made static)
gss_mech_get_by_OID, which is still needed by gss-proxy patches.

The conflict resolution is a bit minimal; we may want some more cleanup.

Linux Kernel Source Tree.

RSS Atom

fs/nfs/super.c	diff1 \|	diff2 \|	blob \| history
fs/nfsd/nfs4xdr.c	diff1 \|	diff2 \|	blob \| history
include/linux/sunrpc/gss_api.h	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/auth_gss.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/gss_krb5_mech.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/gss_mech_switch.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/gss_rpc_upcall.c	diff1 \|	\|	blob \| history
net/sunrpc/auth_gss/gss_rpc_upcall.h	diff1 \|	\|	blob \| history
net/sunrpc/auth_gss/svcauth_gss.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/clnt.c	diff1 \|	diff2 \|	blob \| history