From: David Miller <davem@davemloft.net>
To: linux@armlinux.org.uk
Cc: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com,
netdev@vger.kernel.org
Subject: Re: [PATCH net] net: phylink: fix interface passed to mac_link_up
Date: Thu, 12 Dec 2019 16:57:26 -0800 (PST) [thread overview]
Message-ID: <20191212.165726.700898279205561499.davem@davemloft.net> (raw)
In-Reply-To: <20191213000323.GN25745@shell.armlinux.org.uk>
From: Russell King - ARM Linux admin <linux@armlinux.org.uk>
Date: Fri, 13 Dec 2019 00:03:23 +0000
> On Thu, Dec 12, 2019 at 10:55:44AM -0800, David Miller wrote:
>> From: Russell King <rmk+kernel@armlinux.org.uk>
>> Date: Thu, 12 Dec 2019 10:32:15 +0000
>>
>> > A mismerge between the following two commits:
>> >
>> > c678726305b9 ("net: phylink: ensure consistent phy interface mode")
>> > 27755ff88c0e ("net: phylink: Add phylink_mac_link_{up, down} wrapper functions")
>> >
>> > resulted in the wrong interface being passed to the mac_link_up()
>> > function. Fix this up.
>> >
>> > Fixes: b4b12b0d2f02 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")
>> > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
>>
>> Does not apply to the 'net' tree.
>
> The reason it doesn't apply is the change from link_an_mode to
> cur_link_an_mode on the preceeding line that is in net-next.
> Fixing this in net is going to create another merge conflict.
>
> Would it be better to apply this one to net-next and a similar
> fix to the net tree?
I can handle such trivial merge conflicts when I merge net into net-next.
Especially if you let me know about it like you did here.
Please respin this for 'net'
next prev parent reply other threads:[~2019-12-13 0:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-12 10:32 [PATCH net] net: phylink: fix interface passed to mac_link_up Russell King
2019-12-12 18:55 ` David Miller
2019-12-13 0:03 ` Russell King - ARM Linux admin
2019-12-13 0:57 ` David Miller [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-12-13 10:06 Russell King
2019-12-15 5:51 ` Jakub Kicinski
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=20191212.165726.700898279205561499.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=andrew@lunn.ch \
--cc=f.fainelli@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=linux@armlinux.org.uk \
--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 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).