linux_dsm_epyc7002/drivers/net/ethernet/aquantia/atlantic
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
..
hw_atl Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-06-27 21:06:39 -07:00
aq_cfg.h net: aquantia: replace internal driver version code with uts 2019-06-27 10:58:32 -07:00
aq_common.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422 2019-06-05 17:37:15 +02:00
aq_drvinfo.c net: aquantia: make all files GPL-2.0-only 2019-06-27 10:58:32 -07:00
aq_drvinfo.h net: aquantia: make all files GPL-2.0-only 2019-06-27 10:58:32 -07:00
aq_ethtool.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422 2019-06-05 17:37:15 +02:00
aq_ethtool.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422 2019-06-05 17:37:15 +02:00
aq_filters.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-06-27 21:06:39 -07:00
aq_filters.h net: aquantia: make all files GPL-2.0-only 2019-06-27 10:58:32 -07:00
aq_hw_utils.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422 2019-06-05 17:37:15 +02:00
aq_hw_utils.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422 2019-06-05 17:37:15 +02:00
aq_hw.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422 2019-06-05 17:37:15 +02:00
aq_main.c net: aquantia: implement vlan offload configuration 2019-06-27 10:58:32 -07:00
aq_main.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422 2019-06-05 17:37:15 +02:00
aq_nic.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-06-27 21:06:39 -07:00
aq_nic.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-06-27 21:06:39 -07:00
aq_pci_func.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422 2019-06-05 17:37:15 +02:00
aq_pci_func.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422 2019-06-05 17:37:15 +02:00
aq_ring.c net: aquantia: vlan offloads logic in datapath 2019-06-27 10:58:32 -07:00
aq_ring.h net: aquantia: adding fields and device features for vlan offload 2019-06-27 10:58:32 -07:00
aq_rss.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422 2019-06-05 17:37:15 +02:00
aq_utils.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422 2019-06-05 17:37:15 +02:00
aq_vec.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422 2019-06-05 17:37:15 +02:00
aq_vec.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422 2019-06-05 17:37:15 +02:00
Makefile treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 308 2019-06-05 17:37:04 +02:00
ver.h net: aquantia: replace internal driver version code with uts 2019-06-27 10:58:32 -07:00