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

The ungrafting from PRIO bug fixes in net, when merged into net-next,
merge cleanly but create a build failure.  The resolution used here is
from Petr Machata.

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

2020-01-09 12:13:43 -08:00

..

dpaa

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2019-12-31 13:37:13 -08:00

dpaa2

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2019-12-22 15:15:05 -08:00

enetc

enetc: Fix inconsistent IS_ERR and PTR_ERR

2020-01-07 13:46:42 -08:00

fman

fsl/fman: use resource_size

2020-01-02 16:31:03 -08:00

fs_enet

netdev: pass the stuck queue to the timeout handler

2019-12-12 21:38:57 -08:00

fec_main.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2020-01-09 12:13:43 -08:00

fec_mpc52xx_phy.c

…

fec_mpc52xx.c

netdev: pass the stuck queue to the timeout handler

2019-12-12 21:38:57 -08:00

fec_mpc52xx.h

…

fec_ptp.c

net: fec_ptp: Use platform_get_irq_xxx_optional() to avoid error message

2019-10-29 17:57:16 -07:00

fec.h

net: fec: remove workaround to restart phylib state machine on MDIO timeout

2018-12-18 15:01:55 -08:00

fsl_pq_mdio.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

gianfar_ethtool.c

gianfar: remove forward declarations

2019-09-05 12:28:14 +02:00

gianfar.c

gianfar: Fix TX timestamping with a stacked DSA driver

2019-12-28 11:43:40 -08:00

gianfar.h

gianfar: Maximize Rx buffer size

2019-11-06 10:25:20 -08:00

Kconfig

treewide: Add SPDX license identifier - Makefile/Kconfig

2019-05-21 10:50:46 +02:00

Makefile

net: dsa: felix: fix link error

2020-01-08 16:05:54 -08:00

ucc_geth_ethtool.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

ucc_geth.c

netdev: pass the stuck queue to the timeout handler

2019-12-12 21:38:57 -08:00

ucc_geth.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

xgmac_mdio.c

…