From: Antonio Borneo <antonio.borneo@st.com> To: Alexandre Torgue <alexandre.torgue@st.com>, Jose Abreu <joabreu@synopsys.com>, "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org> Cc: Antonio Borneo <antonio.borneo@st.com>, <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: [PATCH] net: stmmac: fix incorrect merge of patch upstream Date: Tue, 24 Nov 2020 23:37:29 +0100 [thread overview] Message-ID: <20201124223729.886992-1-antonio.borneo@st.com> (raw) In-Reply-To: <42960ede-9355-1277-9a6f-4eac3c22365c@pengutronix.de> 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> --- To: Alexandre Torgue <alexandre.torgue@st.com> To: Jose Abreu <joabreu@synopsys.com> To: "David S. Miller" <davem@davemloft.net> To: Jakub Kicinski <kuba@kernel.org> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> Cc: netdev@vger.kernel.org Cc: linux-stm32@st-md-mailman.stormreply.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org In-Reply-To: <42960ede-9355-1277-9a6f-4eac3c22365c@pengutronix.de> --- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c index 002791b77356..ced6d76a0d85 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c @@ -1171,7 +1171,6 @@ const struct stmmac_ops dwmac4_ops = { .pcs_get_adv_lp = dwmac4_get_adv_lp, .debug = dwmac4_debug, .set_filter = dwmac4_set_filter, - .flex_pps_config = dwmac5_flex_pps_config, .set_mac_loopback = dwmac4_set_mac_loopback, .update_vlan_hash = dwmac4_update_vlan_hash, .sarc_configure = dwmac4_sarc_configure, @@ -1213,6 +1212,7 @@ const struct stmmac_ops dwmac410_ops = { .pcs_get_adv_lp = dwmac4_get_adv_lp, .debug = dwmac4_debug, .set_filter = dwmac4_set_filter, + .flex_pps_config = dwmac5_flex_pps_config, .set_mac_loopback = dwmac4_set_mac_loopback, .update_vlan_hash = dwmac4_update_vlan_hash, .sarc_configure = dwmac4_sarc_configure, base-commit: 9bd2702d292cb7b565b09e949d30288ab7a26d51 -- 2.29.2
WARNING: multiple messages have this Message-ID (diff)
From: Antonio Borneo <antonio.borneo@st.com> To: Alexandre Torgue <alexandre.torgue@st.com>, Jose Abreu <joabreu@synopsys.com>, "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org> Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>, Antonio Borneo <antonio.borneo@st.com>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Maxime Coquelin <mcoquelin.stm32@gmail.com>, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH] net: stmmac: fix incorrect merge of patch upstream Date: Tue, 24 Nov 2020 23:37:29 +0100 [thread overview] Message-ID: <20201124223729.886992-1-antonio.borneo@st.com> (raw) In-Reply-To: <42960ede-9355-1277-9a6f-4eac3c22365c@pengutronix.de> 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> --- To: Alexandre Torgue <alexandre.torgue@st.com> To: Jose Abreu <joabreu@synopsys.com> To: "David S. Miller" <davem@davemloft.net> To: Jakub Kicinski <kuba@kernel.org> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> Cc: netdev@vger.kernel.org Cc: linux-stm32@st-md-mailman.stormreply.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org In-Reply-To: <42960ede-9355-1277-9a6f-4eac3c22365c@pengutronix.de> --- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c index 002791b77356..ced6d76a0d85 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c @@ -1171,7 +1171,6 @@ const struct stmmac_ops dwmac4_ops = { .pcs_get_adv_lp = dwmac4_get_adv_lp, .debug = dwmac4_debug, .set_filter = dwmac4_set_filter, - .flex_pps_config = dwmac5_flex_pps_config, .set_mac_loopback = dwmac4_set_mac_loopback, .update_vlan_hash = dwmac4_update_vlan_hash, .sarc_configure = dwmac4_sarc_configure, @@ -1213,6 +1212,7 @@ const struct stmmac_ops dwmac410_ops = { .pcs_get_adv_lp = dwmac4_get_adv_lp, .debug = dwmac4_debug, .set_filter = dwmac4_set_filter, + .flex_pps_config = dwmac5_flex_pps_config, .set_mac_loopback = dwmac4_set_mac_loopback, .update_vlan_hash = dwmac4_update_vlan_hash, .sarc_configure = dwmac4_sarc_configure, base-commit: 9bd2702d292cb7b565b09e949d30288ab7a26d51 -- 2.29.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-11-24 22:39 UTC|newest] Thread overview: 34+ 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 ` Antonio Borneo 2019-10-07 15:43 ` [PATCH] net: stmmac: fix length of PTP clock's name string Antonio Borneo 2019-10-07 15:43 ` Antonio Borneo 2019-10-09 23:10 ` Jakub Kicinski 2019-10-09 23:10 ` Jakub Kicinski 2019-10-07 15:43 ` [PATCH] net: stmmac: fix disabling flexible PPS output Antonio Borneo 2019-10-07 15:43 ` Antonio Borneo 2019-10-09 23:10 ` Jakub Kicinski 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-07 15:43 ` Antonio Borneo 2019-10-09 22:26 ` Jakub Kicinski 2019-10-09 22:26 ` Jakub Kicinski 2020-11-24 14:15 ` Ahmad Fatoum 2020-11-24 14:15 ` Ahmad Fatoum 2020-11-24 14:23 ` Antonio Borneo 2020-11-24 14:23 ` Antonio Borneo 2020-11-24 18:20 ` Jakub Kicinski 2020-11-24 18:20 ` Jakub Kicinski 2020-11-24 18:27 ` Antonio Borneo 2020-11-24 18:27 ` Antonio Borneo 2020-11-24 18:56 ` Jakub Kicinski 2020-11-24 18:56 ` Jakub Kicinski 2020-11-24 14:27 ` Ahmad Fatoum 2020-11-24 14:27 ` Ahmad Fatoum 2020-11-24 22:37 ` Antonio Borneo [this message] 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 10:55 ` Ahmad Fatoum 2020-11-25 19:26 ` Jakub Kicinski 2020-11-25 19:26 ` Jakub Kicinski 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=20201124223729.886992-1-antonio.borneo@st.com \ --to=antonio.borneo@st.com \ --cc=a.fatoum@pengutronix.de \ --cc=alexandre.torgue@st.com \ --cc=davem@davemloft.net \ --cc=joabreu@synopsys.com \ --cc=kuba@kernel.org \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.