From: Russell King - ARM Linux admin <linux@armlinux.org.uk>
To: David Miller <davem@davemloft.net>
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: Fri, 13 Dec 2019 00:03:23 +0000 [thread overview]
Message-ID: <20191213000323.GN25745@shell.armlinux.org.uk> (raw)
In-Reply-To: <20191212.105544.1239200588810264031.davem@davemloft.net>
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?
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up
According to speedtest.net: 11.9Mbps down 500kbps up
next prev parent reply other threads:[~2019-12-13 0:03 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 [this message]
2019-12-13 0:57 ` David Miller
-- 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=20191213000323.GN25745@shell.armlinux.org.uk \
--to=linux@armlinux.org.uk \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=hkallweit1@gmail.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.