
This is the correct resolution for the conflict from merging the "net" tree fix: commit26cb7085c8
("enetc: Remove the mdio bus on PF probe bailout") with the "net-next" new work: commit07095c025a
("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:a57066b1a0
("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>