David S. Miller c0b458a946 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor conflicts in drivers/net/ethernet/mellanox/mlx5/core/en_rep.c, we had some overlapping changes: 1) In 'net' MLX5E_PARAMS_LOG_{SQ,RQ}_SIZE --> MLX5E_REP_PARAMS_LOG_{SQ,RQ}_SIZE 2) In 'net-next' params->log_rq_size is renamed to be params->log_rq_mtu_frames. 3) In 'net-next' params->hard_mtu is added. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-04-01 19:49:34 -04:00
..
af_smc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-03-23 11:31:58 -04:00
Kconfig
Makefile
smc.h	net/smc: enable ipv6 support for smc	2018-03-16 14:57:26 -04:00
smc_cdc.c
smc_cdc.h
smc_clc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-04-01 19:49:34 -04:00
smc_clc.h	net/smc: add ipv6 support to CLC layer	2018-03-16 14:57:25 -04:00
smc_close.c	net/smc: simplify wait when closing listen socket	2018-03-15 09:49:13 -04:00
smc_close.h
smc_core.c	net/smc: schedule free_work when link group is terminated	2018-03-14 13:40:44 -04:00
smc_core.h
smc_diag.c
smc_ib.c
smc_ib.h
smc_llc.c
smc_llc.h
smc_pnet.c
smc_pnet.h
smc_rx.c
smc_rx.h
smc_tx.c
smc_tx.h
smc_wr.c
smc_wr.h