[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20200911.144729.232221128478351816.davem@davemloft.net>
Date: Fri, 11 Sep 2020 14:47:29 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: claudiu.manoil@....com
Cc: netdev@...r.kernel.org
Subject: Re: [PATCH net] enetc: Fix mdio bus removal on PF probe bailout
From: Claudiu Manoil <claudiu.manoil@....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.manoil@....com>
Applied, thanks for catching this.
Powered by blists - more mailing lists