netdev - Re: [PATCH] net: stmmac: fix incorrect merge of patch upstream

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] [day] [month] [year] [list]

Message-ID: <20201125112627.113c3c0b@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
Date:   Wed, 25 Nov 2020 11:26:27 -0800
From:   Jakub Kicinski <kuba@...nel.org>
To:     Antonio Borneo <antonio.borneo@...com>
Cc:     Alexandre Torgue <alexandre.torgue@...com>,
        Jose Abreu <joabreu@...opsys.com>,
        "David S. Miller" <davem@...emloft.net>, <stable@...r.kernel.org>,
        Ahmad Fatoum <a.fatoum@...gutronix.de>,
        Maxime Coquelin <mcoquelin.stm32@...il.com>,
        <netdev@...r.kernel.org>,
        <linux-stm32@...md-mailman.stormreply.com>,
        <linux-arm-kernel@...ts.infradead.org>,
        <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] net: stmmac: fix incorrect merge of patch upstream

On Tue, 24 Nov 2020 23:37:29 +0100 Antonio Borneo wrote:
> Commit 757926247836 ("net: stmmac: add flexible PPS to dwmac
> 4.10a") was intended to modify the struct dwmac410_ops, but it got
> somehow badly merged and modified the struct dwmac4_ops.
> 
> Revert the modification in struct dwmac4_ops and re-apply it
> properly in struct dwmac410_ops.
> 
> Fixes: 757926247836 ("net: stmmac: add flexible PPS to dwmac 4.10a")
> Cc: stable@...r.kernel.org # v5.6+
> Signed-off-by: Antonio Borneo <antonio.borneo@...com>
> Reported-by: Ahmad Fatoum <a.fatoum@...gutronix.de>

Applied, and queued for 5.9 (all other 5.5+ branches are EOL by now).

Thanks!