David S. Miller d96ff269a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The new route handling in ip_mc_finish_output() from 'net' overlapped with the new support for returning congestion notifications from BPF programs. In order to handle this I had to take the dev_loopback_xmit() calls out of the switch statement. The aquantia driver conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-06-27 21:06:39 -07:00
..
af_smc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-27 21:06:39 -07:00
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02: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: use new in_dev_ifa iterators	2019-06-02 18:06:26 -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: hold conns_lock before calling smc_lgr_register_conn()	2019-06-26 10:10:16 -07:00
smc_core.h	net/smc: improve smc_conn_create reason codes	2019-04-12 10:50:56 -07:00
smc_diag.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
smc_ib.c	net/smc: Use rdma_read_gid_l2_fields to L2 fields	2019-05-03 11:10:03 -03: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	genetlink: optionally validate strictly/dumps	2019-04-27 17:07:22 -04: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
smc.h	net/smc: nonblocking connect rework	2019-04-12 10:50:56 -07:00