-----Original Message----- From: Jerin Jacob <[email protected]> Sent: Wednesday, January 22, 2025 6:04 PM To: Satheesh Paul Antonysamy <[email protected]>; Nithin Kumar Dabilpuram <[email protected]>; Kiran Kumar Kokkilagadda <[email protected]>; Sunil Kumar Kori <[email protected]>; Satha Koteswara Rao Kottidi <[email protected]>; Harman Kalra <[email protected]> Cc: [email protected]; Satheesh Paul Antonysamy <[email protected]> Subject: RE: [EXTERNAL] [dpdk-dev] [PATCH v3 2/2] net/cnxk: support rte flow on cn20k
> -----Original Message----- > From: [email protected] <[email protected]> > Sent: Tuesday, November 12, 2024 3:29 PM > To: Nithin Kumar Dabilpuram <[email protected]>; Kiran Kumar > Kokkilagadda <[email protected]>; Sunil Kumar Kori > <[email protected]>; Satha Koteswara Rao Kottidi > <[email protected]>; Harman Kalra <[email protected]> > Cc: [email protected]; Satheesh Paul Antonysamy <[email protected]> > 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 <[email protected]> > > Support for rte flow in cn20k. > > Signed-off-by: Satheesh Paul <[email protected]> > Reviewed-by: Kiran Kumar K <[email protected]> 1)Fix https://mails.dpdk.org/archives/test-report/2024-November/823929.html This checkpatch warning is a false alarm. 2) Please rebase t Ack. [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
