On 10/31/2016 07:34 AM, David Miller wrote:
> From: Andrew Lunn <and...@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 <and...@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
