From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 385A5C5519F for ; Wed, 25 Nov 2020 10:56:33 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AF15C20678 for ; Wed, 25 Nov 2020 10:56:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="s3OmTSks" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AF15C20678 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=hl+QguIkQktxKnWSM19F6iV8hC2K24siZ3WOSl/KbKA=; b=s3OmTSksc+gfC2suObYMikx0U xAB2tdm+GK2r5VLHLRwIYt/slLVUVgeJGW1ZkJB+adegpEg1OksL6DsZR6XAyj599alPDvO7tpNJl Qkk1duvaHvtlQt9evcfRxW10DLw65sHuGipiNbqmlkdCKCkpW8pOHfjG7Q3csGMbkjHca0EyQgjDC RkPq+oo+1/QrHuvDIC57AXx/ZmNcXBOKNGUwDvLHvJDgls08ulRzTgftTFzXWLpEZgwM/AKflKm9/ foLxSONo52/YU9jlkDCjYGdWtxxNLZH/BKkawxGpImCj1WUcUGDz71mvSVYdwGWuN/K7nCTV1P3zH +Mlv4NBUA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khsSx-0005P9-S0; Wed, 25 Nov 2020 10:56:03 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khsSu-0005O5-RF for linux-arm-kernel@lists.infradead.org; Wed, 25 Nov 2020 10:56:01 +0000 Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=[IPv6:::1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1khsSt-0004DY-GD; Wed, 25 Nov 2020 11:55:59 +0100 Subject: Re: [PATCH] net: stmmac: fix incorrect merge of patch upstream To: Antonio Borneo , Alexandre Torgue , Jose Abreu , "David S. Miller" , Jakub Kicinski References: <42960ede-9355-1277-9a6f-4eac3c22365c@pengutronix.de> <20201124223729.886992-1-antonio.borneo@st.com> From: Ahmad Fatoum Message-ID: <3ba1c4b3-18a0-5448-2188-aa6e2802c57e@pengutronix.de> Date: Wed, 25 Nov 2020 11:55:52 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.3.1 MIME-Version: 1.0 In-Reply-To: <20201124223729.886992-1-antonio.borneo@st.com> Content-Language: en-US X-SA-Exim-Connect-IP: 2001:67c:670:201:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: a.fatoum@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201125_055600_918534_681744D7 X-CRM114-Status: GOOD ( 23.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Maxime Coquelin , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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-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+ I don't think extension of dwmac410_ops should be backported to stable. It's a new feature and should go into net-next like any other. The fix that could be backported is reverting the unintentional change of dwmac4. Cheers, Ahmad > Signed-off-by: Antonio Borneo > Reported-by: Ahmad Fatoum > --- > To: Alexandre Torgue > To: Jose Abreu > To: "David S. Miller" > To: Jakub Kicinski > Cc: Maxime Coquelin > 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 > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel