David S. Miller 6b0a7f84ea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflict resolution of af_smc.c from Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-04-17 11:26:25 -07:00
..
af_smc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-04-17 11:26:25 -07:00
Kconfig
Makefile
smc.h	net/smc: nonblocking connect rework	2019-04-12 10:50:56 -07: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: consolidate function parameters	2019-04-12 10:50:56 -07:00
smc_clc.h	net/smc: improve smc_conn_create reason codes	2019-04-12 10:50:56 -07:00
smc_close.c	net/smc: wait for pending work before clcsock release_sock	2019-04-11 11:04:08 -07:00
smc_close.h	net/smc: wait for pending work before clcsock release_sock	2019-04-11 11:04:08 -07:00
smc_core.c	net/smc: improve smc_conn_create reason codes	2019-04-12 10:50:56 -07:00
smc_core.h	net/smc: improve smc_conn_create reason codes	2019-04-12 10:50:56 -07:00
smc_diag.c
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: fix a NULL pointer dereference	2019-04-11 11:04:08 -07:00
smc_ism.h
smc_llc.c
smc_llc.h
smc_netns.h	net/smc: add pnet table namespace support	2019-02-21 10:34:37 -08:00
smc_pnet.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-04-17 11:26:25 -07:00
smc_pnet.h	net/smc: consolidate function parameters	2019-04-12 10:50:56 -07:00
smc_rx.c
smc_rx.h
smc_tx.c	net/smc: cleanup for smcr_tx_sndbuf_nonempty	2019-02-21 10:34:37 -08:00
smc_tx.h
smc_wr.c
smc_wr.h