| Message ID | E1ifLlX-0004U8-Of@rmk-PC.armlinux.org.uk |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] net: phylink: fix interface passed to mac_link_up | expand |
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.
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?
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'
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 1e6c031985c9..2c360e4e3cff 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -446,8 +446,7 @@ static void phylink_mac_link_up(struct phylink *pl, pl->cur_interface = link_state.interface; pl->ops->mac_link_up(pl->config, pl->cur_link_an_mode, - pl->phy_state.interface, - pl->phydev); + pl->cur_interface, pl->phydev); if (ndev) netif_carrier_on(ndev);
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> --- drivers/net/phy/phylink.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)