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

Just minor overlapping changes in the conflicts here.

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

2019-08-06 18:44:57 -07:00

..

dpaa

Build fixes for skb_frag_size conversion

2019-07-24 11:46:03 -07:00

dpaa2

dpaa2-ptp: add interrupt support

2019-06-15 13:43:06 -07:00

enetc

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

2019-08-06 18:44:57 -07:00

fman

fsl/fman: Remove comment referring to non-existent function

2019-07-25 11:53:37 -07:00

fs_enet

net: Use skb_frag_off accessors

2019-07-30 14:21:32 -07:00

fec_main.c

net: Use skb accessors in network drivers

2019-07-22 20:47:56 -07:00

fec_mpc52xx_phy.c

mdio: Move allocation of interrupts into core

2016-01-07 14:31:26 -05:00

fec_mpc52xx.c

net: ethernet: fix similar warning reported by kbuild test robot

2019-05-10 15:14:29 -07:00

fec_mpc52xx.h

drivers/net: fix up stale paths from driver reorg

2012-01-30 12:54:40 -05:00

fec_ptp.c

net: fec_ptp: Use dev_err() instead of pr_err()

2019-06-05 12:12:40 -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

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

2019-06-05 17:37:09 +02:00

gianfar.c

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

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

gianfar.h

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

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

Kconfig

treewide: Add SPDX license identifier - Makefile/Kconfig

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

Makefile

enetc: Introduce basic PF and VF ENETC ethernet drivers

2019-01-24 21:55:53 -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

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

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

ucc_geth.h

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

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

xgmac_mdio.c

net/fsl: use of_property_read_bool

2016-08-08 16:15:00 -07:00