linux/drivers/net/ethernet
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
..
3com
8390 SPDX update for 5.2-rc6 2019-06-21 09:58:42 -07:00
adaptec
aeroflex
agere
alacritech treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 235 2019-06-19 17:09:07 +02:00
allwinner
alteon
altera
amazon Revert "net: ena: ethtool: add extra properties retrieval via get_priv_flags" 2019-06-26 09:07:39 -07:00
amd treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
apm
apple
aquantia Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-06-27 21:06:39 -07:00
arc treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
atheros Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-06-07 11:00:14 -07:00
aurora
broadcom Generic DIM 2019-06-27 12:42:51 -07:00
brocade
cadence Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-06-27 21:06:39 -07:00
calxeda
cavium net: lio_core: fix potential sign-extension overflow on large shift 2019-06-18 21:00:40 -04:00
chelsio cxgb4: Add MPS refcounting for alloc/free mac filters 2019-06-24 14:54:06 -07:00
cirrus
cisco
cortina
davicom
dec
dlink
emulex be2net: fix link failure after ethtool offline test 2019-06-22 09:40:50 -04:00
ezchip
faraday
freescale Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-06-17 20:20:36 -07:00
fujitsu
hisilicon net: hns3: add exception handling when enable NIC HW error interrupts 2019-06-26 11:59:02 -04:00
hp
huawei hinic: implement the statistical interface of ethtool 2019-06-24 07:18:11 -07:00
i825xx treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
ibm ibmvnic: Fix unchecked return codes of memory allocations 2019-06-09 19:51:28 -07:00
intel i40e/i40e_virtchnl_pf: Use struct_size() in kzalloc() 2019-06-26 09:18:54 -07:00
marvell Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-06-22 08:59:24 -04:00
mediatek net: ethernet: mediatek: Add MT7621 TRGMII mode support 2019-06-22 16:58:24 -07:00
mellanox Generic DIM 2019-06-27 12:42:51 -07:00
micrel treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
microchip treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
moxa
mscc ocelot: remove unused variable 'rc' in vcap_cmd() 2019-06-09 20:11:53 -07:00
myricom
natsemi
neterion
netronome nfp: flower: add GRE encap action support 2019-06-27 19:47:36 -07:00
ni
nuvoton
nvidia
nxp
oki-semi
packetengines
pasemi treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 234 2019-06-19 17:09:07 +02:00
qlogic qed: Fix -Wmaybe-uninitialized false positive 2019-06-18 10:44:21 -07:00
qualcomm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-06-17 20:20:36 -07:00
rdc
realtek r8169: don't activate ASPM in chip if OS can't control ASPM 2019-06-21 22:05:42 -04:00
renesas
rocker Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-06-07 11:00:14 -07:00
samsung treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
seeq treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
sfc treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
sgi
silan
sis sis900: fix TX completion 2019-06-22 16:46:32 -07:00
smsc
socionext net: netsec: remove loops in napi Rx process 2019-06-19 10:28:20 -04:00
stmicro Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-06-27 21:06:39 -07:00
sun
synopsys
tehuti
ti net: ethernet: ti: cpsw: Fix suspend/resume break 2019-06-24 07:22:55 -07:00
toshiba ps3_gelic: Use [] to denote a flexible array member 2019-06-18 10:43:20 -07:00
tundra
via
wiznet net: ethernet: wiznet: w5X00 add device tree support 2019-06-12 09:52:04 -07:00
xilinx net: axienet: move use of resource after validity check 2019-06-13 22:41:24 -07:00
xircom
xscale
dnet.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
dnet.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
ec_bhf.c
ethoc.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
fealnx.c
jme.c
jme.h
Kconfig
korina.c
lantiq_etop.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 234 2019-06-19 17:09:07 +02:00
lantiq_xrx200.c
Makefile
netx-eth.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 234 2019-06-19 17:09:07 +02:00