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

Mere overlapping changes in the conflicts here.

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

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

..

dpaa2-eth-debugfs.c

dpaa2: no need to check return value of debugfs_create functions

2019-08-10 15:25:48 -07:00

dpaa2-eth-debugfs.h

dpaa2: no need to check return value of debugfs_create functions

2019-08-10 15:25:48 -07:00

dpaa2-eth-trace.h

…

dpaa2-eth.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

2019-11-20 18:11:23 -08:00

dpaa2-eth.h

dpaa2-eth: add MAC/PHY support through phylink

2019-10-31 14:19:45 -07:00

dpaa2-ethtool.c

dpaa2-eth: add ethtool MAC counters

2019-11-07 15:31:53 -08:00

dpaa2-mac.c

dpaa2-eth: add ethtool MAC counters

2019-11-07 15:31:53 -08:00

dpaa2-mac.h

dpaa2-eth: add ethtool MAC counters

2019-11-07 15:31:53 -08:00

dpaa2-ptp.c

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

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

dpaa2-ptp.h

net: dpaa2: Use the correct style for SPDX License Identifier

2019-10-28 13:40:17 -07:00

dpkg.h

…

dpmac-cmd.h

dpaa2-eth: add ethtool MAC counters

2019-11-07 15:31:53 -08:00

dpmac.c

dpaa2-eth: add ethtool MAC counters

2019-11-07 15:31:53 -08:00

dpmac.h

dpaa2-eth: add ethtool MAC counters

2019-11-07 15:31:53 -08:00

dpni-cmd.h

dpaa2-eth: Add pause frame support

2019-08-29 16:52:12 -07:00

dpni.c

dpaa2-eth: Add new DPNI statistics counters

2019-09-05 00:24:06 +02:00

dpni.h

dpaa2-eth: add irq for the dpmac connect/disconnect event

2019-10-17 15:27:29 -04:00

dprtc-cmd.h

dpaa2-ptp: add external trigger event support

2019-12-16 15:56:41 -08:00

dprtc.c

dpaa2-ptp: add interrupt support

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

dprtc.h

dpaa2-ptp: add external trigger event support

2019-12-16 15:56:41 -08:00

Kconfig

dpaa2-ptp: fix compile error

2019-11-06 21:50:06 -08:00

Makefile

dpaa2-eth: add MAC/PHY support through phylink

2019-10-31 14:19:45 -07:00