From: Jakub Kicinski <kuba@kernel.org>
To: Antonio Borneo <antonio.borneo@st.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>,
Jose Abreu <joabreu@synopsys.com>,
"David S. Miller" <davem@davemloft.net>, <stable@vger.kernel.org>,
Ahmad Fatoum <a.fatoum@pengutronix.de>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
<netdev@vger.kernel.org>,
<linux-stm32@st-md-mailman.stormreply.com>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] net: stmmac: fix incorrect merge of patch upstream
Date: Wed, 25 Nov 2020 11:26:27 -0800 [thread overview]
Message-ID: <20201125112627.113c3c0b@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> (raw)
In-Reply-To: <20201124223729.886992-1-antonio.borneo@st.com>
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!
next prev parent reply other threads:[~2020-11-25 19:26 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-07 15:43 [PATCH] ptp: fix typo of "mechanism" in Kconfig help text Antonio Borneo
2019-10-07 15:43 ` [PATCH] staging: rtl8723bs: fix typo of "mechanism" in comment Antonio Borneo
2019-10-07 15:43 ` [PATCH] net: stmmac: fix length of PTP clock's name string Antonio Borneo
2019-10-09 23:10 ` Jakub Kicinski
2019-10-07 15:43 ` [PATCH] net: stmmac: fix disabling flexible PPS output Antonio Borneo
2019-10-09 23:10 ` Jakub Kicinski
2019-10-07 15:43 ` [PATCH] net: stmmac: add flexible PPS to dwmac 4.10a Antonio Borneo
2019-10-09 22:26 ` Jakub Kicinski
2020-11-24 14:15 ` Ahmad Fatoum
2020-11-24 14:23 ` Antonio Borneo
2020-11-24 18:20 ` Jakub Kicinski
2020-11-24 18:27 ` Antonio Borneo
2020-11-24 18:56 ` Jakub Kicinski
2020-11-24 14:27 ` Ahmad Fatoum
2020-11-24 22:37 ` [PATCH] net: stmmac: fix incorrect merge of patch upstream Antonio Borneo
2020-11-25 10:55 ` Ahmad Fatoum
2020-11-25 19:26 ` Jakub Kicinski [this message]
2019-10-07 19:04 ` [PATCH] ptp: fix typo of "mechanism" in Kconfig help text David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201125112627.113c3c0b@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com \
--to=kuba@kernel.org \
--cc=a.fatoum@pengutronix.de \
--cc=alexandre.torgue@st.com \
--cc=antonio.borneo@st.com \
--cc=davem@davemloft.net \
--cc=joabreu@synopsys.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).