David S. Miller 5cd3da4ba2 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... Simple overlapping changes in stmmac driver. Adjust skb_gro_flush_final_remcsum function signature to make GRO list changes in net-next, as per Stephen Rothwell's example merge resolution. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-03 10:29:26 +09:00
..
af_smc.c	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-07-03 10:29:26 +09:00
Kconfig
Makefile	net/smc: add base infrastructure for SMC-D and ISM	2018-06-30 20:42:25 +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	net/smc: add SMC-D support in CLC messages	2018-06-30 20:42:25 +09:00
smc_clc.h	net/smc: add SMC-D support in CLC messages	2018-06-30 20:42:25 +09:00
smc_close.c
smc_close.h
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
smc_llc.h
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_tx.c	net/smc: add SMC-D support in data transfer	2018-06-30 20:42:26 +09: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
smc.h	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-07-03 10:29:26 +09:00