From: David Miller <davem@davemloft.net>
To: saeedm@mellanox.com
Cc: netdev@vger.kernel.org, ogerlitz@mellanox.com
Subject: Re: mlx5 stable backport help
Date: Wed, 20 Feb 2019 12:27:40 -0800 (PST) [thread overview]
Message-ID: <20190220.122740.445688569983151429.davem@davemloft.net> (raw)
In-Reply-To: <33b67a2b9a67bc9fe307edc0a3eeeab875598a09.camel@mellanox.com>
From: Saeed Mahameed <saeedm@mellanox.com>
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".
next prev parent reply other threads:[~2019-02-20 20:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-20 6:36 mlx5 stable backport help David Miller
2019-02-20 20:01 ` Saeed Mahameed
2019-02-20 20:27 ` David Miller [this message]
2019-02-20 23:58 ` Saeed Mahameed
2019-02-21 0:21 ` David Miller
2019-02-21 0:43 ` Saeed Mahameed
2019-02-21 10:21 ` Or Gerlitz
2019-02-21 22:35 ` Saeed Mahameed
2019-02-22 9:13 ` Or Gerlitz
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=20190220.122740.445688569983151429.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=ogerlitz@mellanox.com \
--cc=saeedm@mellanox.com \
/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