David S. Miller 3793faad7b Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Conflicts were all overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2020-05-06 22:10:13 -07:00

..

mvpp2

net: mvpp2: cls: Prevent buffer overflow in mvpp2_ethtool_cls_rule_del()

2020-05-06 14:15:46 -07:00

octeontx2

octeontx2-pf: Fix error return code in otx2_probe()

2020-04-30 20:28:34 -07:00

Kconfig

net: mvneta: introduce page pool API for sw buffer manager

2019-10-21 10:36:07 -07:00

Makefile

octeontx2-af: Add Marvell OcteonTX2 RVU AF driver

2018-10-10 10:06:01 -07:00

mv643xx_eth.c

net: mv643xx_eth: Remove unused inline function sum16_as_be

2020-05-05 12:07:43 -07:00

mvmdio.c

net: mvmdio: avoid error message for optional IRQ

2020-03-17 20:54:37 -07:00

mvneta_bm.c

net: mvneta: use devm_platform_ioremap_resource() to simplify code

2019-08-21 13:52:33 -07:00

mvneta_bm.h

net: mvneta: make stub functions static inline

2019-10-25 16:21:48 -07:00

mvneta.c

net: mvneta: Fix a typo

2020-04-12 21:20:27 -07:00

pxa168_eth.c

net: convert additional drivers to use phy_do_ioctl

2020-01-22 21:16:32 +01:00

skge.c

net: skge: reject unsupported coalescing params

2020-03-14 21:13:54 -07:00

skge.h

PCI: Add constant PCI_STATUS_ERROR_BITS

2020-03-04 14:21:00 -08:00

sky2.c

net: sky2: reject unsupported coalescing params

2020-03-14 21:13:54 -07:00

sky2.h

PCI: Add constant PCI_STATUS_ERROR_BITS

2020-03-04 14:21:00 -08:00