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

[Jakub Kicinski]

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@xxxxxxxxxxxxxxx # v5.6+
> Signed-off-by: Antonio Borneo <antonio.borneo@xxxxxx>
> Reported-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>

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

Thanks!