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 B9C44A04E7; Mon, 2 Nov 2020 11:45:23 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5CDE5BE4B; Mon, 2 Nov 2020 11:45:22 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 236CFBE65 for ; Mon, 2 Nov 2020 11:45:18 +0100 (CET) IronPort-SDR: 5ep8Mww4XUMNH1VGvjumMux7NMDvCfALCectvb3yisfLSTst8Sjm3HyqPT/mnS8YQp9XJfCIWD MiWCT/5hHfaw== X-IronPort-AV: E=McAfee;i="6000,8403,9792"; a="165361776" X-IronPort-AV: E=Sophos;i="5.77,444,1596524400"; d="scan'208";a="165361776" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Nov 2020 02:45:16 -0800 IronPort-SDR: VvxUI1mMM5e3rx3z2yA3zwCu2rXSNObSkFXMz/+IbzC16ijD8/MdGS3kZegf3llXUWN3p64QzC IGRXoCEUnmVQ== X-IronPort-AV: E=Sophos;i="5.77,444,1596524400"; d="scan'208";a="537971046" Received: from fyigit-mobl1.ger.corp.intel.com (HELO [10.213.219.143]) ([10.213.219.143]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Nov 2020 02:45:14 -0800 To: Ivan Malov , Andrew Rybchenko , dev@dpdk.org References: <1603957185-29309-1-git-send-email-arybchenko@solarflare.com> From: Ferruh Yigit Message-ID: Date: Mon, 2 Nov 2020 10:45:08 +0000 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" On 11/2/2020 9:22 AM, Ivan Malov wrote: > 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. > Thanks for catching it, fixing it now. > 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. >