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=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,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 4F8FEC43381 for ; Wed, 20 Feb 2019 20:27:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 24B4B2146E for ; Wed, 20 Feb 2019 20:27:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726420AbfBTU1m (ORCPT ); Wed, 20 Feb 2019 15:27:42 -0500 Received: from shards.monkeyblade.net ([23.128.96.9]:55696 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726017AbfBTU1l (ORCPT ); Wed, 20 Feb 2019 15:27:41 -0500 Received: from localhost (unknown [IPv6:2601:601:9f80:35cd::bf5]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: davem-davemloft) by shards.monkeyblade.net (Postfix) with ESMTPSA id 64D5012489777; Wed, 20 Feb 2019 12:27:41 -0800 (PST) Date: Wed, 20 Feb 2019 12:27:40 -0800 (PST) Message-Id: <20190220.122740.445688569983151429.davem@davemloft.net> To: saeedm@mellanox.com Cc: netdev@vger.kernel.org, ogerlitz@mellanox.com Subject: Re: mlx5 stable backport help From: David Miller In-Reply-To: <33b67a2b9a67bc9fe307edc0a3eeeab875598a09.camel@mellanox.com> References: <20190219.223612.1535166672416390768.davem@davemloft.net> <33b67a2b9a67bc9fe307edc0a3eeeab875598a09.camel@mellanox.com> X-Mailer: Mew version 6.8 on Emacs 26.1 Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Wed, 20 Feb 2019 12:27:41 -0800 (PST) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Saeed Mahameed Date: Wed, 20 Feb 2019 20:01:00 +0000 > On Tue, 2019-02-19 at 22:36 -0800, David Miller wrote: >> 218d05ce326f9e1b40a56085431fa1068b43d5d9 ("net/mlx5e: Don't overwrite >> pedit action when multiple pedit used") >> > > I tried and this patch applies smoothly on 4.19. Does not apply to v4.19.24 which is the current stable release. [davem@localhost linux-stable]$ git am QUEUE/mlx5e/0002-net-mlx5e-Don-t-overwrite-pedit-action-when-multiple.patch Applying: net/mlx5e: Don't overwrite pedit action when multiple pedit used error: patch failed: drivers/net/ethernet/mellanox/mlx5/core/en_tc.c:128 error: drivers/net/ethernet/mellanox/mlx5/core/en_tc.c: patch does not apply Patch failed at 0001 net/mlx5e: Don't overwrite pedit action when multiple pedit used hint: Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".