On Wed, 2019-02-20 at 12:27 -0800, David Miller wrote:
> From: Saeed Mahameed <sae...@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".
Strange, worked for me: (I saw some warnings though!)
saeedm@sx1[linux](stbl/4.19)$ git cherry-pick
218d05ce326f9e1b40a56085431fa1068b43d5d9
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at
least 2119 and retry the command.
[stbl/4.19 efa42113bb1d] net/mlx5e: Don't overwrite pedit action when
multiple pedit used
Author: Tonghao Zhang <xiangxia.m....@gmail.com>
Date: Mon Jan 28 15:28:06 2019 -0800
1 file changed, 15 insertions(+), 10 deletions(-)
saeedm@sx1[linux](stbl/4.19)$ git log --oneline
efa42113bb1d (HEAD -> stbl/4.19) net/mlx5e: Don't overwrite pedit
action when multiple pedit used
f287634fe321 (tag: v4.19.24, stable/linux-4.19.y) Linux 4.19.24
dd5f4d067a2c mm: proc: smaps_rollup: fix pss_locked calculation
I did what the git suggested and:
$ git config merge.renamelimit 2119
Tried again, it worked with now warnings.
Maybe you have some git config which fails on the warning i saw..
Thanks,
Saeed.
