Re: mlx5 stable backport help

[Saeed Mahameed <saeedm@mellanox.com>]

On Wed, 2019-02-20 at 16:21 -0800, David Miller wrote:
> From: Saeed Mahameed <saeedm@mellanox.com>
> Date: Wed, 20 Feb 2019 23:58:12 +0000
> 
> > Maybe you have some git config which fails on the warning i saw.. 
> 
> Put the actual commit into a patch using "git format-patch" then try
> to use "git am" to apply it.
> 
> I'm not doing anything fancy.

I see, for some reason cherry-pick is happy to resolve the conflict
without human help.

Anyway the conflict is really simple and contextual, 2 hunks will fail

1) adding a new filed "max_mod_hdr_actions" to "struct
mlx5e_tc_flow_parse_attr"

2) at parse_tc_pedit_action() line 1924 :
replace:
-       err = alloc_mod_hdr_actions(priv, a, namespace, parse_attr);
-       if (err)
-               goto out_err;

with:
+       if (!parse_attr->mod_hdr_actions) {
+               err = alloc_mod_hdr_actions(priv, a, namespace,
parse_attr);
+               if (err)
+                       goto out_err;
+       }

all in drivers/net/ethernet/mellanox/mlx5/core/en_tc.c file
they fail since the surrounding code is slightly different.