iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers/net/ethernet/freescale
History
Claudiu Manoil cdb0e6dccc enetc: Fix mdio bus removal on PF probe bailout 
This is the correct resolution for the conflict from
merging the "net" tree fix:
commit 26cb7085c898 ("enetc: Remove the mdio bus on PF probe bailout")
with the "net-next" new work:
commit 07095c025ac2 ("net: enetc: Use DT protocol information to set up the ports")
that moved mdio bus allocation to an ealier stage of
the PF probing routine.

Fixes: a57066b1a019 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net")
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-09-11 14:47:57 -07:00
..
dpaa
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
dpaa2
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
enetc
enetc: Fix mdio bus removal on PF probe bailout
2020-09-11 14:47:57 -07:00
fman
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
fs_enet
net: fs_enet: remove redundant null check
2020-07-20 17:42:17 -07:00
fec_main.c
net: fec: correct the error path for regulator disable in probe
2020-08-14 16:48:29 -07:00
fec_mpc52xx_phy.c
…
fec_mpc52xx.c
net: convert suitable network drivers to use phy_do_ioctl
2020-01-21 10:50:41 +01:00
fec_mpc52xx.h
…
fec_ptp.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2020-07-25 17:49:04 -07:00
fec.h
net: fec: fix hardware time stamping by external devices
2020-07-16 11:20:38 -07: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
net: gianfar: reject unsupported coalescing params
2020-03-12 11:32:35 -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
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
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
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
xgmac_mdio.c
net/fsl: enable extended scanning in xgmac_mdio
2020-06-23 20:35:15 -07:00