|WARNING| pw137108 [PATCH] [v2] net/cnxk: support Tx queue descriptor count

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Satha Koteswara Rao Kottidi <skoteshwar at marvell.com>
Date: Friday, February 23 2024 15:33:57 
Applied on: CommitID:e9c81b801b647b1e06bb9f0e6da99b49b28b5162
Apply patch set 137108 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 (92c0ad70caf3ed6f4b93de6ddaf7bc369737c049)
Done: main commit 92c0ad70caf3ed6f4b93de6ddaf7bc369737c049
Trying to checkout branch: origin/next-net-mrvl-for-main
Checked out to next-net-mrvl-for-main (e9c81b801b647b1e06bb9f0e6da99b49b28b5162)
Applying patch...

Failed to apply patch:
Applying: net/cnxk: support Tx queue descriptor count
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_24_03.rst
M	drivers/net/cnxk/cnxk_ethdev.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/cnxk/cnxk_ethdev.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: support Tx queue descriptor count
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".


Trying to checkout branch: main
Checked out to main (e9c81b801b647b1e06bb9f0e6da99b49b28b5162)
Applying patch...

Failed to apply patch:
Applying: net/cnxk: support Tx queue descriptor count
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_24_03.rst
M	drivers/net/cnxk/cnxk_ethdev.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/cnxk/cnxk_ethdev.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: support Tx queue descriptor count
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/29247/

UNH-IOL DPDK Community Lab