David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux ... All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-20 21:17:12 -07:00
..
Kconfig	net/smc: remove Kconfig warning	2017-07-29 11:22:58 -07:00
Makefile	net/smc: add base infrastructure for SMC-D and ISM	2018-06-30 20:42:25 +09:00
af_smc.c	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
smc.h	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-07-03 10:29:26 +09:00
smc_cdc.c	net/smc: add SMC-D support in data transfer	2018-06-30 20:42:26 +09:00
smc_cdc.h	net/smc: add SMC-D support in data transfer	2018-06-30 20:42:26 +09:00
smc_clc.c	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
smc_clc.h	net/smc: add SMC-D support in CLC messages	2018-06-30 20:42:25 +09:00
smc_close.c	net/smc: reduce sock_put() for fallback sockets	2018-07-07 20:25:13 +09:00
smc_close.h	net/smc: replace sock_put worker by socket refcounting	2018-01-26 10:41:56 -05:00
smc_core.c	net/smc: add SMC-D support in af_smc	2018-06-30 20:42:26 +09:00
smc_core.h	net/smc: add SMC-D support in af_smc	2018-06-30 20:42:26 +09:00
smc_diag.c	net/smc: add SMC-D diag support	2018-06-30 20:42:26 +09:00
smc_ib.c	net/smc: add pnetid support	2018-06-30 20:42:25 +09:00
smc_ib.h	net/smc: add pnetid support	2018-06-30 20:42:25 +09:00
smc_ism.c	net/smc: add SMC-D support in data transfer	2018-06-30 20:42:26 +09:00
smc_ism.h	net/smc: add base infrastructure for SMC-D and ISM	2018-06-30 20:42:25 +09:00
smc_llc.c	net/smc: drop messages when link state is inactive	2018-05-16 11:49:20 -04:00
smc_llc.h	net/smc: use a workqueue to defer llc send	2018-05-16 11:49:19 -04:00
smc_pnet.c	net/smc: add pnetid support for SMC-D and ISM	2018-06-30 20:42:25 +09:00
smc_pnet.h	net/smc: add pnetid support for SMC-D and ISM	2018-06-30 20:42:25 +09:00
smc_rx.c	net/smc: add SMC-D support in data transfer	2018-06-30 20:42:26 +09:00
smc_rx.h	smc: add support for splice()	2018-05-04 11:45:06 -04:00
smc_tx.c	net/smc: optimize consumer cursor updates	2018-07-18 10:58:27 -07:00
smc_tx.h	net/smc: add SMC-D support in data transfer	2018-06-30 20:42:26 +09:00
smc_wr.c	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
smc_wr.h	net/smc: pay attention to MAX_ORDER for CQ entries	2018-03-14 13:40:44 -04:00