David S. Miller 1602f49b58 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were two cases of simple overlapping changes, nothing serious. In the UDP case, we need to add a hlist_add_tail_rcu() to linux/rculist.h, because we've moved UDP socket handling away from using nulls lists. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-04-23 18:51:33 -04:00
..
auth_gss	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2016-04-14 18:15:40 -07:00
xprtrdma	Various bugfixes, a RDMA update from Chuck Lever, and support for a new	2016-03-24 10:41:00 -07:00
Kconfig	rpcrdma: Merge svcrdma and xprtrdma modules into one	2015-06-04 16:56:02 -04:00
Makefile	SUNRPC: Add a structure to track multiple transports	2016-02-05 18:48:54 -05:00
addr.c	replace strict_strto calls	2014-07-12 18:45:49 -04:00
auth.c	kernel/params: constify struct kernel_param_ops uses	2015-05-28 11:32:10 +09:30
auth_generic.c	sunrpc: eliminate RPC_DEBUG	2014-11-24 17:31:46 -05:00
auth_null.c	nfsd: Lower NFSv4.1 callback message size limit	2016-03-01 13:06:35 -08:00
auth_unix.c	nfsd: Lower NFSv4.1 callback message size limit	2016-03-01 13:06:35 -08:00
backchannel_rqst.c	SUNRPC: Fix callback channel	2015-12-07 13:04:59 -08:00
cache.c	mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros	2016-04-04 10:41:08 -07:00
clnt.c	SUNRPC: Allow addition of new transports to a struct rpc_clnt	2016-02-05 18:48:57 -05:00
debugfs.c	SUNRPC: Address kbuild warning in net/sunrpc/debugfs.c	2015-06-11 14:01:06 -04:00
netns.h	Merge branch 'for-3.14' of git://linux-nfs.org/~bfields/linux	2014-01-30 10:18:43 -08:00
rpc_pipe.c	mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros	2016-04-04 10:41:08 -07:00
rpcb_clnt.c	SUNRPC: Use the multipath iterator to assign a transport to each task	2016-02-05 18:48:55 -05:00
sched.c	SUNRPC: Allow caller to specify the transport to use	2016-02-05 18:48:55 -05:00
socklib.c	sunrpc: do not pull udp headers on receive	2016-04-11 15:31:33 -04:00
stats.c	sunrpc: add rpc_count_iostats_idx	2015-02-03 11:06:38 -08:00
sunrpc.h	SUNRPC: track whether a request is coming from a loop-back interface.	2014-05-22 15:59:18 -04:00
sunrpc_syms.c	sunrpc: make debugfs file creation failure non-fatal	2015-04-23 14:42:27 -04:00
svc.c	SUNRPC: Fix callback channel	2015-12-07 13:04:59 -08:00
svc_xprt.c	sunrpc: Add a function to close temporary transports immediately	2015-12-23 10:08:15 -05:00
svcauth.c	svcrpc: move some initialization to common code	2015-11-24 10:39:16 -07:00
svcauth_unix.c	svcrpc: move some initialization to common code	2015-11-24 10:39:16 -07:00
svcsock.c	sock: tigthen lockdep checks for sock_owned_by_user	2016-04-13 22:37:20 -04:00
sysctl.c	Sunrpc: Supports hexadecimal number for sysctl files of sunrpc debug	2015-11-03 15:56:49 -05:00
timer.c	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
xdr.c	mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage	2016-04-04 10:41:08 -07:00
xprt.c	SUNRPC: Use the multipath iterator to assign a transport to each task	2016-02-05 18:48:55 -05:00
xprtmultipath.c	SUNRPC: Add a structure to track multiple transports	2016-02-05 18:48:54 -05:00
xprtsock.c	sock: tigthen lockdep checks for sock_owned_by_user	2016-04-13 22:37:20 -04:00