> -----Original Message-----
> From: psathe...@marvell.com <psathe...@marvell.com>
> Sent: Tuesday, November 12, 2024 3:29 PM
> To: Nithin Kumar Dabilpuram <ndabilpu...@marvell.com>; Kiran Kumar
> Kokkilagadda <kirankum...@marvell.com>; Sunil Kumar Kori
> <sk...@marvell.com>; Satha Koteswara Rao Kottidi
> <skotesh...@marvell.com>; Harman Kalra <hka...@marvell.com>
> Cc: dev@dpdk.org; Satheesh Paul Antonysamy <psathe...@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 <psathe...@marvell.com>
> 
> Support for rte flow in cn20k.
> 
> Signed-off-by: Satheesh Paul <psathe...@marvell.com>
> Reviewed-by: Kiran Kumar K <kirankum...@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

Reply via email to