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
..
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
qedi.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 440	2019-06-05 17:37:17 +02:00
qedi_dbg.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 440	2019-06-05 17:37:17 +02:00
qedi_dbg.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 440	2019-06-05 17:37:17 +02:00
qedi_debugfs.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 440	2019-06-05 17:37:17 +02:00
qedi_fw.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 440	2019-06-05 17:37:17 +02:00
qedi_fw_api.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 440	2019-06-05 17:37:17 +02:00
qedi_fw_iscsi.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 440	2019-06-05 17:37:17 +02:00
qedi_fw_scsi.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 440	2019-06-05 17:37:17 +02:00
qedi_gbl.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 440	2019-06-05 17:37:17 +02:00
qedi_hsi.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 440	2019-06-05 17:37:17 +02:00
qedi_iscsi.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 440	2019-06-05 17:37:17 +02:00
qedi_iscsi.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 440	2019-06-05 17:37:17 +02:00
qedi_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-27 21:06:39 -07:00
qedi_nvm_iscsi_cfg.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 440	2019-06-05 17:37:17 +02:00
qedi_sysfs.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 440	2019-06-05 17:37:17 +02:00
qedi_version.h	SCSI fixes on 20190622	2019-06-22 09:39:03 -07:00