netdev - Re: [PATCH net] net: phylink: fix interface passed to mac_link

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20191213000323.GN25745@shell.armlinux.org.uk>
Date:   Fri, 13 Dec 2019 00:03:23 +0000
From:   Russell King - ARM Linux admin <linux@...linux.org.uk>
To:     David Miller <davem@...emloft.net>
Cc:     andrew@...n.ch, f.fainelli@...il.com, hkallweit1@...il.com,
        netdev@...r.kernel.org
Subject: Re: [PATCH net] net: phylink: fix interface passed to mac_link_up

On Thu, Dec 12, 2019 at 10:55:44AM -0800, David Miller wrote:
> From: Russell King <rmk+kernel@...linux.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@...linux.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