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=-9.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=ham 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 234F2C56201 for ; Wed, 25 Nov 2020 19:27:58 +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 A0144206D9 for ; Wed, 25 Nov 2020 19:27:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="jwtVfZK2"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="qnwv5kbx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A0144206D9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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:MIME-Version:References:In-Reply-To:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=cHXV+0qPp3YLtu8ClPZCcijGG79t9m68XYH9yETRPoU=; b=jwtVfZK281xDwr29hnpyoZs3I y7++2hMc+Byc5Vhjy66OCyOxWo+fs15JNtVwS07hUkfEZf4mqE10PhXepAOwTnagoZu+V+lLNKXqQ sOAbYLDibXVM/G2wd0TBVhJQp7/ea3aIvE+WGMGPOwzH8ehEcf21ApzmHyVbh5Vv+oUCFcS9leglX TDz+kMxCD58ySx/xpCjx90jzWQymldPDJj5MzdckuwAnor8FTSe+D1dUsjR0/PbMojJC3YR4sXYlm K0WOblgFf3SoMQVntaAfSI7ZUzvt/5pQ+Lx2Jn4RpelTd6LBWWOG3EcxT2vQ0cWoOQYJy7ZQZf3qz ae1KlhdpQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ki0R0-0008HJ-9V; Wed, 25 Nov 2020 19:26:34 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ki0Qw-0008FL-Tn for linux-arm-kernel@lists.infradead.org; Wed, 25 Nov 2020 19:26:31 +0000 Received: from kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com (unknown [163.114.132.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9EA07206D9; Wed, 25 Nov 2020 19:26:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1606332389; bh=y5G7G9tqQU0nNNYbyoVzJ6yqFdXX1xV0mpcHxeV68Ac=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=qnwv5kbxfR1G+CdcN52GwSplgjaPdm0fTc0l/8FM7uScdg4VvXnX4IWjOwV62BfVq NmbOGw0+P4rP+f+KtS7LX7YaJ5ikwX06YLbUF/9KTpjdhs4WftBY0yOJbXRHF4KVCY uw3BxXCNOSLzcEzAkzGMYELJkR7cypSjjVLbWGTM= Date: Wed, 25 Nov 2020 11:26:27 -0800 From: Jakub Kicinski To: Antonio Borneo Subject: Re: [PATCH] net: stmmac: fix incorrect merge of patch upstream Message-ID: <20201125112627.113c3c0b@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> In-Reply-To: <20201124223729.886992-1-antonio.borneo@st.com> References: <42960ede-9355-1277-9a6f-4eac3c22365c@pengutronix.de> <20201124223729.886992-1-antonio.borneo@st.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201125_142631_195579_40226EA9 X-CRM114-Status: GOOD ( 11.59 ) 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: Ahmad Fatoum , Alexandre Torgue , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, Jose Abreu , Maxime Coquelin , "David S. Miller" , 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 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 > Reported-by: Ahmad Fatoum Applied, and queued for 5.9 (all other 5.5+ branches are EOL by now). Thanks! _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel