Hi Ferruh, Many thanks for your help.
It looks like I forgot to add the lineFixes: 0902ed140fcf("common/sfc_efx/base: add MAE action set provisioning APIs")
to the commit log of the patch. Currently, the said commit has old suffix used in it:drivers/common/sfc_efx/base/efx_mae.c:927: MAE_ACTION_SET_ALLOC_IN_DELIVER, spec->emass_deliver_mport.sel);
The point at which this wrong line is fixed to "emass -> ema" is
0f41b86eff7e ("common/sfc_efx/base: support adding FLAG action to set")
that is, an irrelevant patch.
I apologise for any inconvenience. Does fixing these two commits resolve
the conflicts?
On 30/10/2020 17:20, Ferruh Yigit wrote:
On 10/29/2020 7:39 AM, Andrew Rybchenko wrote:From: Ivan Malov <[email protected]> In libefx, a struct member name prefix is an abbreviation for the struct name. Fix mismatch in the case of action set spec struct.Fixes: aeacb8458950 ("common/sfc_efx/base: support adding DELIVER action to set") Fixes: c73d314f790c ("common/sfc_efx/base: support adding VLAN POP action to set") Fixes: 19aa67196d08 ("common/sfc_efx/base: support adding VLAN PUSH action") Fixes: 633a89842c17 ("common/sfc_efx/base: support adding MARK action to set")Signed-off-by: Ivan Malov <[email protected]> Signed-off-by: Andrew Rybchenko <[email protected]> Reviewed-by: Andy Moreton <[email protected]>Squashed into relevant commit in next-net, thanks. Please confirm it from latest head of next-net. Unfortunately this will cause conflicts to the vendor sub-trees.
-- Ivan M
