From: Florian Fainelli <f.fainelli@gmail.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, tremyfr@gmail.com, jaedon.shin@gmail.com
Subject: Re: [PATCH net] Revert "net: ethernet: bcmgenet: use phydev from struct net_device"
Date: Sat, 24 Sep 2016 19:51:49 -0700 [thread overview]
Message-ID: <9fa471d4-a179-519b-005f-5b52f31c5903@gmail.com> (raw)
In-Reply-To: <20160924.201054.1736819083455070537.davem@davemloft.net>
On 09/24/2016 05:10 PM, David Miller wrote:
> From: Florian Fainelli <f.fainelli@gmail.com>
> Date: Sat, 24 Sep 2016 12:58:30 -0700
>
>> There is already a commit:
>>
>> Revert "net: ethernet: bcmgenet: use phy_ethtool_{get|set}_link_ksettings"
>>
>> which should make this apply cleanly to "net" now.
>
> But look at net-next, it got re-added there.
>
> This is going to be a bit of a merge hassle, and this is why I pushed
> back on the other attempt to revert this thing.
OK, so how about this:
- this patch applies to net which should be okay for now
- to avoid future conflicts when you merge net into net-next, I submit a
revert of "net: ethernet: bcmgenet: use
phy_ethtool_{get|set}_link_ksettings" against net-next
Does that work for you?
next prev parent reply other threads:[~2016-09-25 2:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-24 19:58 [PATCH net] Revert "net: ethernet: bcmgenet: use phydev from struct net_device" Florian Fainelli
2016-09-25 0:10 ` David Miller
2016-09-25 2:51 ` Florian Fainelli [this message]
2016-09-25 3:02 ` Florian Fainelli
2016-09-25 9:35 ` David Miller
2016-09-27 11:42 ` David Miller
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=9fa471d4-a179-519b-005f-5b52f31c5903@gmail.com \
--to=f.fainelli@gmail.com \
--cc=davem@davemloft.net \
--cc=jaedon.shin@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=tremyfr@gmail.com \
/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 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).