David S. Miller 5b79c2af66 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of easy overlapping changes in the confict resolutions here. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-26 19:46:15 -04:00
..
client.c	net/9p/client.c: fix potential refcnt problem of trans module	2018-04-05 21:36:23 -07:00
error.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
Kconfig	IB: remove redundant INFINIBAND kconfig dependencies	2018-05-09 08:51:03 -04:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mod.c	net/9p: correct the variable name in v9fs_get_trans_by_name() comment	2018-05-07 23:38:15 -04:00
protocol.c	net/9p: switch to copy_from_iter_full()	2017-04-21 13:57:22 -04:00
protocol.h	net/9p: Convert net/9p protocol dumps to tracepoints	2011-10-24 11:13:12 -05:00
trans_common.c	net/9p: correct some comment errors in 9p file system code	2018-05-10 08:21:53 -04:00
trans_common.h	net/9p: remove (now-)unused helpers	2015-04-11 22:28:29 -04:00
trans_fd.c	net/9p: correct some comment errors in 9p file system code	2018-05-10 08:21:53 -04:00
trans_rdma.c	net/9p: correct some comment errors in 9p file system code	2018-05-10 08:21:53 -04:00
trans_virtio.c	net/9p: correct some comment errors in 9p file system code	2018-05-10 08:21:53 -04:00
trans_xen.c	net/9p: fix spelling mistake: "suspsend" -> "suspend"	2018-05-10 15:23:50 -04:00
util.c	net/9p: convert to idr_alloc()	2013-02-27 19:10:20 -08:00