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

2020-11-25 Thread 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 a

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

2020-11-25 Thread Ahmad Fatoum
Hello, On 24.11.20 23:37, 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-ap

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

2020-11-24 Thread Antonio Borneo
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: 75792624783