From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 42945A04E7; Mon, 2 Nov 2020 10:22:49 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 202B4AD6F; Mon, 2 Nov 2020 10:22:48 +0100 (CET) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by dpdk.org (Postfix) with ESMTP id 5BC3F72ED for ; Mon, 2 Nov 2020 10:22:45 +0100 (CET) Received: from [192.168.45.100] (unknown [188.242.7.54]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by shelob.oktetlabs.ru (Postfix) with ESMTPSA id D3ADA7F508; Mon, 2 Nov 2020 12:22:43 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru D3ADA7F508 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=oktetlabs.ru; s=default; t=1604308963; bh=8+BbNBvnWq9J2uxEomJJ4CdsEG29YwYqErOPmALAdGY=; h=Subject:To:References:From:Date:In-Reply-To; b=sazlJTbp35lnhXxTP4BO4ILsLZCuLj2uniwlqJsVyejKt363d5lZYCxdPX9h/Agc2 xPbKwkUqU9edu+bKSt/pc5gSSRSnepl3YNLkQWCAlZ+9aTsBdUrUnYt1d7mSoby1hL 8ZtzVpTCedWjTE3uw3BfheiTC67UqoBSp8vL7e3c= To: Ferruh Yigit , Andrew Rybchenko , dev@dpdk.org References: <1603957185-29309-1-git-send-email-arybchenko@solarflare.com> From: Ivan Malov Message-ID: Date: Mon, 2 Nov 2020 12:22:43 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.3.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH] common/sfc_efx/base: fix prefix in struct member names X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Hi Ferruh, Many thanks for your help. It looks like I forgot to add the line Fixes: 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 >> >> 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 >> Signed-off-by: Andrew Rybchenko >> Reviewed-by: Andy Moreton > > 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