DPDK patches and discussions
 help / color / mirror / Atom feed
From: Ivan Malov <Ivan.Malov@oktetlabs.ru>
To: Ferruh Yigit <ferruh.yigit@intel.com>,
	Andrew Rybchenko <arybchenko@solarflare.com>,
	dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH] common/sfc_efx/base: fix prefix in struct member names
Date: Mon, 2 Nov 2020 12:22:43 +0300
Message-ID: <f513f536-a103-9dc5-41cb-9ca6821f3286@oktetlabs.ru> (raw)
In-Reply-To: <def68bd8-6882-ba9b-30b8-d70d9aa7d30e@intel.com>

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 <ivan.malov@oktetlabs.ru>
>>
>> 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 <ivan.malov@oktetlabs.ru>
>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
>> Reviewed-by: Andy Moreton <amoreton@xilinx.com>
> 
> 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

  reply	other threads:[~2020-11-02  9:22 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-29  7:39 Andrew Rybchenko
2020-10-30 14:20 ` Ferruh Yigit
2020-11-02  9:22   ` Ivan Malov [this message]
2020-11-02 10:45     ` Ferruh Yigit
2020-11-02 11:18       ` Ferruh Yigit
2020-11-02 12:03         ` Ivan Malov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f513f536-a103-9dc5-41cb-9ca6821f3286@oktetlabs.ru \
    --to=ivan.malov@oktetlabs.ru \
    --cc=arybchenko@solarflare.com \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git