Messages in this thread | | | Date | Wed, 25 Nov 2020 11:26:27 -0800 | From | Jakub Kicinski <> | 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@vger.kernel.org # v5.6+ > Signed-off-by: Antonio Borneo <antonio.borneo@st.com> > Reported-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Applied, and queued for 5.9 (all other 5.5+ branches are EOL by now).
Thanks!
| |