Jakub Kicinski 2295cddf99 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Minor conflicts in net/mptcp/protocol.h and tools/testing/selftests/net/Makefile. In both cases code was added on both sides in the same place so just keep both. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2020-10-15 12:43:21 -07:00
..
af_smc.c	net/smc: restore smcd_version when all ISM V2 devices failed to init	2020-10-09 18:15:47 -07:00
Kconfig
Makefile
smc_cdc.c	net/smc: use separate work queues for different worker types	2020-09-10 15:24:27 -07:00
smc_cdc.h
smc_clc.c	net/smc: CLC decline - V2 enhancements	2020-09-28 15:19:03 -07:00
smc_clc.h	net/smc: CLC decline - V2 enhancements	2020-09-28 15:19:03 -07:00
smc_close.c	net/smc: check variable before dereferencing in smc_close.c	2020-09-16 17:30:16 -07:00
smc_close.h
smc_core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-10-15 12:43:21 -07:00
smc_core.h	net/smc: introduce CLC first contact extension	2020-09-28 15:19:03 -07:00
smc_diag.c	net/smc: use the retry mechanism for netlink messages	2020-09-10 15:24:27 -07:00
smc_ib.c
smc_ib.h
smc_ism.c	net/smc: use an array to check fields in system EID	2020-10-03 17:04:48 -07:00
smc_ism.h	net/smc: introduce CHID callback for ISM devices	2020-09-28 15:19:03 -07:00
smc_llc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-10-15 12:43:21 -07:00
smc_llc.h
smc_netns.h	net/smc: introduce list of pnetids for Ethernet devices	2020-09-28 15:19:03 -07:00
smc_pnet.c	net/smc: determine proposed ISM devices	2020-09-28 15:19:03 -07:00
smc_pnet.h	net/smc: determine proposed ISM devices	2020-09-28 15:19:03 -07:00
smc_rx.c
smc_rx.h
smc_tx.c	net/smc: use separate work queues for different worker types	2020-09-10 15:24:27 -07:00
smc_tx.h
smc_wr.c
smc_wr.h
smc.h	net/smc: introduce CLC first contact extension	2020-09-28 15:19:03 -07:00