mv643xx_eth.c merge gone bad...
Subsystems (2)
Hi Dave
The merge of commit 27058af401e49d88a905df000dd26f443fcfa8ce for mv643xx_eth.c has gone bad:
@@@ -3203,12 -3204,6 +3220,15 @@@
dev->priv_flags |= IFF_UNICAST_FLT;
dev->gso_max_segs = MV643XX_MAX_TSO_SEGS;++<<<<<<< HEAD
+ /* MTU range: 64 - 9500 */ + dev->min_mtu = 64; + dev->max_mtu = 9500;
+
+ SET_NETDEV_DEV(dev, &pdev->dev);
+
++=======
++>>>>>>> 2a26d99b251b8625d27aed14e97fc10707a3a81f
if (mp->shared->win_protect)
wrl(mp, WINDOW_PROTECT(mp->port_num), mp->shared->win_protect);Andrew
David Miller
maintainerFrom: Andrew Lunn <[email protected]>
Date: Mon, 31 Oct 2016 12:33:49 +0100
Quoted 2 lines
The merge of commit
27058af401e49d88a905df000dd26f443fcfa8ceformv643xx_eth.chas gone bad:
Sorry this should be fixed now.
Thanks.
Quoted 7 lines · David Miller
From: Andrew Lunn <[email protected]>
Date: Mon, 31 Oct 2016 12:33:49 +0100Quoted 2 lines
The merge of commit
27058af401e49d88a905df000dd26f443fcfa8ceformv643xx_eth.chas gone bad:Sorry this should be fixed now.
Hi David
I think the SET_NETDEV_DEV() should be removed, which is what cause the merged conflict:
http://patchwork.ozlabs.org/patch/687294/
Andrew
David Miller
maintainerFrom: Andrew Lunn <[email protected]>
Date: Mon, 31 Oct 2016 14:35:38 +0100
Quoted 7 lines · David Miller
Quoted 6 lines
From: Andrew Lunn <[email protected]>
Date: Mon, 31 Oct 2016 12:33:49 +0100Quoted 2 lines
The merge of commit
27058af401e49d88a905df000dd26f443fcfa8ceformv643xx_eth.chas gone bad:
Quoted 7 lines
Quoted 1 line
Sorry this should be fixed now.
Hi David
I think the
SET_NETDEV_DEV()should be removed, which is what cause the merged conflict:
Indeed, fixed.
Thanks Andrew.
Quoted 17 lines · David Miller
From: Andrew Lunn <[email protected]>
Date: Mon, 31 Oct 2016 14:35:38 +0100Quoted 14 lines · David Miller
Quoted 7 lines
From: Andrew Lunn <[email protected]>
Date: Mon, 31 Oct 2016 12:33:49 +0100Quoted 2 lines
The merge of commit
27058af401e49d88a905df000dd26f443fcfa8ceformv643xx_eth.chas gone bad:Sorry this should be fixed now.
Hi David
I think the
SET_NETDEV_DEV()should be removed, which is what cause the merged conflict:
The SET_NETDEV_DEV() is required for Jason's change to work, since he is doing this:
+static int get_phy_mode(struct mv643xx_eth_private *mp) +{
+ struct device *dev = mp->dev->dev.parent;
Signature · 1 line
Florian
Quoted 22 lines · Florian Fainelli
Quoted 17 lines · David Miller
From: Andrew Lunn <[email protected]>
Date: Mon, 31 Oct 2016 14:35:38 +0100Quoted 14 lines · David Miller
Quoted 7 lines
From: Andrew Lunn <[email protected]>
Date: Mon, 31 Oct 2016 12:33:49 +0100Quoted 2 lines
The merge of commit
27058af401e49d88a905df000dd26f443fcfa8ceformv643xx_eth.chas gone bad:Sorry this should be fixed now.
Hi David
I think the
SET_NETDEV_DEV()should be removed, which is what cause the merged conflict:The
SET_NETDEV_DEV()is required for Jason's change to work, since he is doing this:
Review
Quoted 3 lines
(quoted diff) +3
-0+static int get_phy_mode(struct mv643xx_eth_private *mp) +{ + struct device *dev = mp->dev->dev.parent;
Hi Florian
That requires the SET_NETDEV_DEV() which is in a different hunk of the original patch, moving it earlier. This is the old one which is being removed.
Andrew