David S. Miller 70f3522614 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Three conflicts, one of which, for marvell10g.c is non-trivial and requires some follow-up from Heiner or someone else. The issue is that Heiner converted the marvell10g driver over to use the generic c45 code as much as possible. However, in 'net' a bug fix appeared which makes sure that a new local mask (MDIO_AN_10GBT_CTRL_ADV_NBT_MASK) with value 0x01e0 is cleared. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-24 12:06:19 -08:00
..
af_smc.c	net/smc: add pnet table namespace support	2019-02-21 10:34:37 -08: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
smc_cdc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-15 12:38:38 -08:00
smc_cdc.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-15 12:38:38 -08:00
smc_clc.c	net/smc: fix another sizeof to int comparison	2019-02-01 14:45:44 -08:00
smc_clc.h	net/smc: short wait for late smc_clc_wait_msg	2018-11-23 17:20:32 -08:00
smc_close.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-08 15:00:17 -08: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: check connections in smc_lgr_free_work	2019-02-12 11:59:45 -05:00
smc_core.h	net/smc: preallocated memory for rdma work requests	2019-02-04 09:11:19 -08:00
smc_diag.c	net/smc: original socket family in inet_sock_diag	2019-02-07 18:06:19 -08:00
smc_ib.c	net/smc: rework pnet table	2019-02-21 10:34:37 -08:00
smc_ib.h	net/smc: rework pnet table	2019-02-21 10:34:37 -08:00
smc_ism.c	net/smc: add SMC-D shutdown signal	2018-11-21 16:14:56 -08:00
smc_ism.h	net/smc: add SMC-D shutdown signal	2018-11-21 16:14:56 -08:00
smc_llc.c	net/smc: preallocated memory for rdma work requests	2019-02-04 09:11:19 -08:00
smc_llc.h	net/smc: add infrastructure to send delete rkey messages	2018-11-23 17:20:32 -08:00
smc_netns.h	net/smc: add pnet table namespace support	2019-02-21 10:34:37 -08:00
smc_pnet.c	net/smc: allow PCI IDs as ib device names in the pnet table	2019-02-21 10:34:37 -08:00
smc_pnet.h	net/smc: add pnet table namespace support	2019-02-21 10:34:37 -08:00
smc_rx.c	net/smc: remove local variable page in smc_rx_splice()	2018-07-23 10:57:14 -07:00
smc_rx.h	smc: add support for splice()	2018-05-04 11:45:06 -04:00
smc_tx.c	net/smc: cleanup for smcr_tx_sndbuf_nonempty	2019-02-21 10:34:37 -08:00
smc_tx.h	net/smc: eliminate cursor read and write calls	2018-07-23 10:57:14 -07:00
smc_wr.c	net/smc: preallocated memory for rdma work requests	2019-02-04 09:11:19 -08:00
smc_wr.h	net/smc: preallocated memory for rdma work requests	2019-02-04 09:11:19 -08:00
smc.h	net/smc: fix smc_poll in SMC_INIT state	2019-02-21 10:19:20 -08:00