From: Andrew Lunn <andrew@lunn.ch>
To: Florian Fainelli <f.fainelli@gmail.com>
Cc: David Miller <davem@davemloft.net>,
jgunthorpe@obsidianresearch.com, jarod@redhat.com,
netdev@vger.kernel.org
Subject: Re: mv643xx_eth.c merge gone bad...
Date: Mon, 31 Oct 2016 19:22:01 +0100 [thread overview]
Message-ID: <20161031182201.GI9441@lunn.ch> (raw)
In-Reply-To: <efd31e03-7d18-a41e-bf7f-3c77faa6e825@gmail.com>
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
prev parent reply other threads:[~2016-10-31 18:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161031182201.GI9441@lunn.ch \
--to=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=jarod@redhat.com \
--cc=jgunthorpe@obsidianresearch.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.