From: Jerin Jacob <jerinj@marvell.com>
To: Satheesh Paul Antonysamy <psatheesh@marvell.com>,
Nithin Kumar Dabilpuram <ndabilpuram@marvell.com>,
Kiran Kumar Kokkilagadda <kirankumark@marvell.com>,
Sunil Kumar Kori <skori@marvell.com>,
Satha Koteswara Rao Kottidi <skoteshwar@marvell.com>,
Harman Kalra <hkalra@marvell.com>
Cc: "dev@dpdk.org" <dev@dpdk.org>,
Satheesh Paul Antonysamy <psatheesh@marvell.com>
Subject: RE: [EXTERNAL] [dpdk-dev] [PATCH v3 2/2] net/cnxk: support rte flow on cn20k
Date: Wed, 22 Jan 2025 12:33:38 +0000 [thread overview]
Message-ID: <BY3PR18MB4785FDA39D49796CBEB9C685C8E12@BY3PR18MB4785.namprd18.prod.outlook.com> (raw)
In-Reply-To: <20241112095851.1521495-2-psatheesh@marvell.com>
> -----Original Message-----
> From: psatheesh@marvell.com <psatheesh@marvell.com>
> Sent: Tuesday, November 12, 2024 3:29 PM
> To: Nithin Kumar Dabilpuram <ndabilpuram@marvell.com>; Kiran Kumar
> Kokkilagadda <kirankumark@marvell.com>; Sunil Kumar Kori
> <skori@marvell.com>; Satha Koteswara Rao Kottidi
> <skoteshwar@marvell.com>; Harman Kalra <hkalra@marvell.com>
> Cc: dev@dpdk.org; Satheesh Paul Antonysamy <psatheesh@marvell.com>
> Subject: [EXTERNAL] [dpdk-dev] [PATCH v3 2/2] net/cnxk: support rte flow on
> cn20k
>
> From: Satheesh Paul <psatheesh@ marvell. com> Support for rte flow in cn20k.
> Signed-off-by: Satheesh Paul <psatheesh@ marvell. com> Reviewed-by: Kiran
> Kumar K <kirankumark@ marvell. com> --- drivers/net/cnxk/cn10k_flow. c | 227
> ++-----------------------
> From: Satheesh Paul <psatheesh@marvell.com>
>
> Support for rte flow in cn20k.
>
> Signed-off-by: Satheesh Paul <psatheesh@marvell.com>
> Reviewed-by: Kiran Kumar K <kirankumark@marvell.com>
1)Fix https://mails.dpdk.org/archives/test-report/2024-November/823929.html
2) Please rebase t
[for-main]dell[dpdk-next-net-mrvl] $ git pw series apply 33903
Failed to apply patch:
Applying: common/cnxk: support NPC flow on cn20k
Using index info to reconstruct a base tree...
M drivers/common/cnxk/roc_mbox.h
M drivers/common/cnxk/roc_npc.h
M drivers/common/cnxk/roc_npc_mcam_dump.c
M drivers/common/cnxk/version.map
Falling back to patching base and 3-way merge...
Auto-merging drivers/common/cnxk/version.map
Auto-merging drivers/common/cnxk/roc_npc_mcam_dump.c
CONFLICT (content): Merge conflict in drivers/common/cnxk/roc_npc_mcam_dump.c
Auto-merging drivers/common/cnxk/roc_npc.h
Auto-merging drivers/common/cnxk/roc_mbox.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 common/cnxk: support NPC flow on cn20k
prev parent reply other threads:[~2025-01-22 12:33 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-21 4:01 [dpdk-dev] [PATCH 1/2] common/cnxk: support NPC " psatheesh
2024-10-21 4:01 ` [dpdk-dev] [PATCH 2/2] net/cnxk: support rte " psatheesh
2024-10-21 17:09 ` Stephen Hemminger
2024-10-29 7:31 ` [dpdk-dev] [PATCH v2 1/2] common/cnxk: support NPC " psatheesh
2024-10-29 7:31 ` [dpdk-dev] [PATCH v2 2/2] net/cnxk: support rte " psatheesh
2024-11-04 11:29 ` Jerin Jacob
2024-11-12 9:58 ` [dpdk-dev] [PATCH v3 1/2] common/cnxk: support NPC " psatheesh
2024-11-12 9:58 ` [dpdk-dev] [PATCH v3 2/2] net/cnxk: support rte " psatheesh
2025-01-22 12:33 ` Jerin Jacob [this message]
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=BY3PR18MB4785FDA39D49796CBEB9C685C8E12@BY3PR18MB4785.namprd18.prod.outlook.com \
--to=jerinj@marvell.com \
--cc=dev@dpdk.org \
--cc=hkalra@marvell.com \
--cc=kirankumark@marvell.com \
--cc=ndabilpuram@marvell.com \
--cc=psatheesh@marvell.com \
--cc=skori@marvell.com \
--cc=skoteshwar@marvell.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).