Re: [ 06/59] Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.

[Ben Hutchings <ben@decadent.org.uk>]

[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]

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 <kenth.eriksson@transmode.com>
> 
> [ 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 <baruch@tkos.co.il>
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
$

Ben.

-- 
Ben Hutchings
It is easier to change the specification to fit the program than vice versa.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]