|WARNING| pw137647 [PATCH] [v2] net/cnxk: performance improvement for SW mbuf free

[dpdklab at iol.unh.edu]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/137647

_apply patch failure_

Submitter: Rahul Bhansali <rbhansali at marvell.com>
Date: Friday, March 01 2024 03:16:45 
Applied on: CommitID:5df34de5808a7b826b8bc035d6ee3161a12be364
Apply patch set 137647 failed:

Cloning the DPDK mirror at: https://github.com/DPDK/dpdk.git (Attempt 1 of 3)
Trying to checkout branch: main
Checked out to main (5df34de5808a7b826b8bc035d6ee3161a12be364)
Done: main commit 5df34de5808a7b826b8bc035d6ee3161a12be364
Trying to checkout branch: main
Checked out to main (5df34de5808a7b826b8bc035d6ee3161a12be364)
Applying patch...

Failed to apply patch:
Applying: net/cnxk: performance improvement for SW mbuf free
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_24_03.rst
M	drivers/net/cnxk/cn10k_tx.h
M	drivers/net/cnxk/cn9k_tx.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/cnxk/cn9k_tx.h
CONFLICT (content): Merge conflict in drivers/net/cnxk/cn9k_tx.h
Auto-merging drivers/net/cnxk/cn10k_tx.h
CONFLICT (content): Merge conflict in drivers/net/cnxk/cn10k_tx.h
Auto-merging doc/guides/rel_notes/release_24_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 net/cnxk: performance improvement for SW mbuf free
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".


https://lab.dpdk.org/results/dashboard/patchsets/29356/

UNH-IOL DPDK Community Lab