WSL2-Linux-Kernel/drivers/net/ethernet/freescale
Jakub Kicinski 2295cddf99 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflicts in net/mptcp/protocol.h and
tools/testing/selftests/net/Makefile.

In both cases code was added on both sides in the same place
so just keep both.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2020-10-15 12:43:21 -07:00
..
dpaa dpaa_eth: enable NETIF_MSG_HW by default 2020-10-10 10:49:56 -07:00
dpaa2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-10-05 18:40:01 -07:00
enetc enetc: Migrate to PHYLINK and PCS_LYNX 2020-10-11 11:04:42 -07:00
fman drivers/net/ethernet: clean up mis-targeted comments 2020-09-25 16:29:00 -07:00
fs_enet fs_enet: Avoid comma separated statements 2020-08-25 07:54:19 -07:00
Kconfig treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
Makefile net: dsa: felix: fix link error 2020-01-08 16:05:54 -08:00
fec.h net: fec: fix hardware time stamping by external devices 2020-07-16 11:20:38 -07:00
fec_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-10-15 12:43:21 -07:00
fec_mpc52xx.c net: fec_mpc52xx: Replace in_interrupt() usage 2020-09-29 14:02:54 -07:00
fec_mpc52xx.h
fec_mpc52xx_phy.c mdio: Move allocation of interrupts into core 2016-01-07 14:31:26 -05:00
fec_ptp.c drivers/net/ethernet: clean up mis-targeted comments 2020-09-25 16:29:00 -07:00
fsl_pq_mdio.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152 2019-05-30 11:26:32 -07:00
gianfar.c net: gianfar: Add of_node_put() before goto statement 2020-08-18 13:12:12 -07:00
gianfar.h net/freescale: Clean drivers from static versions 2020-03-03 17:54:55 -08:00
gianfar_ethtool.c net: gianfar: reject unsupported coalescing params 2020-03-12 11:32:35 -07:00
ucc_geth.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
ucc_geth.h net/freescale: Clean drivers from static versions 2020-03-03 17:54:55 -08:00
ucc_geth_ethtool.c net/freescale: Don't set zero if FW not-available in ucc_geth 2020-03-03 17:54:55 -08:00
xgmac_mdio.c net/fsl: quieten expected MDIO access failures 2020-09-24 20:13:26 -07:00