David S. Miller 0f3e9c97eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All of the conflicts were cases of overlapping changes. In net/core/devlink.c, we have to make care that the resouce size_params have become a struct member rather than a pointer to such an object. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-03-06 01:20:46 -05:00
..
af_smc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-03-06 01:20:46 -05:00
Kconfig
Makefile
smc_cdc.c	net/smc: use a constant for control message length	2018-02-28 12:30:25 -05:00
smc_cdc.h	net/smc: get rid of tx_pend waits in socket closing	2018-01-24 10:52:57 -05:00
smc_clc.c	net/smc: move netinfo function to file smc_clc.c	2018-03-01 13:21:31 -05:00
smc_clc.h	net/smc: do not allow eyecatchers in rmbe	2018-03-01 13:21:31 -05:00
smc_close.c	net/smc: release clcsock from tcp_listen_worker	2018-01-26 10:41:56 -05:00
smc_close.h	net/smc: replace sock_put worker by socket refcounting	2018-01-26 10:41:56 -05:00
smc_core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-03-06 01:20:46 -05:00
smc_core.h	net/smc: prevent new connections on link group	2018-03-01 13:21:31 -05:00
smc_diag.c	net/smc: check for healthy link group resp. connections	2018-01-25 16:10:42 -05:00
smc_ib.c	net/smc: handle device, port, and QP error events	2018-01-26 10:41:56 -05:00
smc_ib.h
smc_llc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-03-06 01:20:46 -05:00
smc_llc.h	net/smc: process add/delete link messages	2018-03-01 13:21:31 -05:00
smc_pnet.c
smc_pnet.h
smc_rx.c	vfs: do bulk POLL* -> EPOLL* replacement	2018-02-11 14:34:03 -08:00
smc_rx.h
smc_tx.c	vfs: do bulk POLL* -> EPOLL* replacement	2018-02-11 14:34:03 -08:00
smc_tx.h
smc_wr.c	net/smc: check for healthy link group resp. connections	2018-01-25 16:10:42 -05:00
smc_wr.h	net/smc: get rid of tx_pend waits in socket closing	2018-01-24 10:52:57 -05:00
smc.h	net/smc: remove unused fields from smc structures	2018-03-01 13:21:31 -05:00