From: Claudiu Manoil <claudiu.man...@nxp.com>
Date: Fri, 11 Sep 2020 13:16:35 +0300
> 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.man...@nxp.com>
Applied, thanks for catching this.
