On Thu, Apr 12, 2012 at 12:55 AM, Ben Hutchings <[email protected]> wrote: > On Wed, 2012-04-11 at 16:10 -0700, Greg KH wrote: >> 3.2-stable review patch. If anyone has any objections, please let me know. >> >> ------------------ >> >> >> From: Kenth Eriksson <[email protected]> >> >> [ Upstream commit 464b57da56910c8737ede75ad820b9a7afc46b3e ] >> >> The merge done in commit b26e478f undid bug fix in commit c3e072f8 >> ("net: fsl_pq_mdio: fix non tbi phy access"), with the result that non >> TBI (e.g. MDIO) PHYs cannot be accessed. > [...] > > This doesn't look relevant to 3.2. > > $ git describe --contains b26e478f > v3.3-rc1~182^2~207 > $ git describe --contains c3e072f8 > v3.3-rc1~182^2~598 > $ git show c3e072f8 | head -8 > commit c3e072f8a6c5625028531c40ec65f7e301531be2 > Author: Baruch Siach <[email protected]> > Date: Mon Nov 14 08:21:30 2011 +0200 > > net: fsl_pq_mdio: fix non tbi phy access > > Since 952c5ca1 (fsl_pq_mdio: Clean up tbi address configuration) .probe > returns > -EBUSY when the "tbi-phy" node is missing. Fix this. > $ git describe --contains 952c5ca1 > v3.3-rc1~182^2~603 > $ git rev-list v3.2..v3.2.14 drivers/net/ethernet/freescale/fsl_pq_mdio.c
I think 952c5ca1 is a red herring; What is called out as the regression commit appeared in tree earlier than that as 28d8ea2d568. $ git describe --contains 28d8ea2d568 v3.2-rc6~3^2~6 $ git show 952c5ca1|diffstat -p0 b/drivers/net/ethernet/freescale/fsl_pq_mdio.c | 53 +++---------------------- 1 file changed, 8 insertions(+), 45 deletions(-) $ git show 28d8ea2d568 | diffstat -p0 b/drivers/net/ethernet/freescale/fsl_pq_mdio.c | 53 +++---------------------- 1 file changed, 8 insertions(+), 45 deletions(-) $ I documented some history about this in commit 1ee4af86fa16d636. I wasn't aware of the bad merge at the time; adding the TBI node to my mpc836x board DTS simply fixed the issue with no source changes. Paul. > $ > > Ben. > > -- > Ben Hutchings > It is easier to change the specification to fit the program than vice versa. -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
