* mv643xx_eth.c merge gone bad...
@ 2016-10-31 11:33 Andrew Lunn
2016-10-31 13:12 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Lunn @ 2016-10-31 11:33 UTC (permalink / raw)
To: David Miller, jgunthorpe, jarod; +Cc: netdev
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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: mv643xx_eth.c merge gone bad...
2016-10-31 11:33 mv643xx_eth.c merge gone bad Andrew Lunn
@ 2016-10-31 13:12 ` David Miller
2016-10-31 13:35 ` Andrew Lunn
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2016-10-31 13:12 UTC (permalink / raw)
To: andrew; +Cc: jgunthorpe, jarod, netdev
From: Andrew Lunn <andrew@lunn.ch>
Date: Mon, 31 Oct 2016 12:33:49 +0100
> The merge of commit 27058af401e49d88a905df000dd26f443fcfa8ce for
> mv643xx_eth.c has gone bad:
Sorry this should be fixed now.
Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: mv643xx_eth.c merge gone bad...
2016-10-31 13:12 ` David Miller
@ 2016-10-31 13:35 ` Andrew Lunn
2016-10-31 14:34 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Lunn @ 2016-10-31 13:35 UTC (permalink / raw)
To: David Miller; +Cc: jgunthorpe, jarod, netdev
On Mon, Oct 31, 2016 at 09:12:06AM -0400, David Miller wrote:
> From: Andrew Lunn <andrew@lunn.ch>
> Date: Mon, 31 Oct 2016 12:33:49 +0100
>
> > The merge of commit 27058af401e49d88a905df000dd26f443fcfa8ce for
> > mv643xx_eth.c has 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: mv643xx_eth.c merge gone bad...
2016-10-31 13:35 ` Andrew Lunn
@ 2016-10-31 14:34 ` David Miller
2016-10-31 18:18 ` Florian Fainelli
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2016-10-31 14:34 UTC (permalink / raw)
To: andrew; +Cc: jgunthorpe, jarod, netdev
From: Andrew Lunn <andrew@lunn.ch>
Date: Mon, 31 Oct 2016 14:35:38 +0100
> On Mon, Oct 31, 2016 at 09:12:06AM -0400, David Miller wrote:
>> From: Andrew Lunn <andrew@lunn.ch>
>> Date: Mon, 31 Oct 2016 12:33:49 +0100
>>
>> > The merge of commit 27058af401e49d88a905df000dd26f443fcfa8ce for
>> > mv643xx_eth.c has 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/
Indeed, fixed.
Thanks Andrew.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: mv643xx_eth.c merge gone bad...
2016-10-31 14:34 ` David Miller
@ 2016-10-31 18:18 ` Florian Fainelli
2016-10-31 18:22 ` Andrew Lunn
0 siblings, 1 reply; 6+ messages in thread
From: Florian Fainelli @ 2016-10-31 18:18 UTC (permalink / raw)
To: David Miller, andrew; +Cc: jgunthorpe, jarod, netdev
On 10/31/2016 07:34 AM, David Miller wrote:
> From: Andrew Lunn <andrew@lunn.ch>
> Date: Mon, 31 Oct 2016 14:35:38 +0100
>
>> On Mon, Oct 31, 2016 at 09:12:06AM -0400, David Miller wrote:
>>> From: Andrew Lunn <andrew@lunn.ch>
>>> Date: Mon, 31 Oct 2016 12:33:49 +0100
>>>
>>>> The merge of commit 27058af401e49d88a905df000dd26f443fcfa8ce for
>>>> mv643xx_eth.c has 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/
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;
--
Florian
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: mv643xx_eth.c merge gone bad...
2016-10-31 18:18 ` Florian Fainelli
@ 2016-10-31 18:22 ` Andrew Lunn
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Lunn @ 2016-10-31 18:22 UTC (permalink / raw)
To: Florian Fainelli; +Cc: David Miller, jgunthorpe, jarod, netdev
On Mon, Oct 31, 2016 at 11:18:54AM -0700, Florian Fainelli wrote:
> On 10/31/2016 07:34 AM, David Miller wrote:
> > From: Andrew Lunn <andrew@lunn.ch>
> > Date: Mon, 31 Oct 2016 14:35:38 +0100
> >
> >> On Mon, Oct 31, 2016 at 09:12:06AM -0400, David Miller wrote:
> >>> From: Andrew Lunn <andrew@lunn.ch>
> >>> Date: Mon, 31 Oct 2016 12:33:49 +0100
> >>>
> >>>> The merge of commit 27058af401e49d88a905df000dd26f443fcfa8ce for
> >>>> mv643xx_eth.c has 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/
>
> 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;
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-10-31 18:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-31 11:33 mv643xx_eth.c merge gone bad Andrew Lunn
2016-10-31 13:12 ` David Miller
2016-10-31 13:35 ` Andrew Lunn
2016-10-31 14:34 ` David Miller
2016-10-31 18:18 ` Florian Fainelli
2016-10-31 18:22 ` Andrew Lunn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).