|WARNING| pw135843 [PATCH] [v1] ethdev: support Tx queue used count

|WARNING| pw135843 [PATCH] [v1] ethdev: support Tx queue used count

[dpdklab]

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

_apply patch failure_

Submitter: Jerin Jacob Kollanukkaran <jerinj@marvell.com>
Date: Thursday, January 11 2024 15:17:44 
Applied on: CommitID:6560d57ceebf122c7950e633ea7ed97b44351035
Apply patch set 135843 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 (6ef07151aac4b4d9601d547f94a996d1c71b3871)
Done: main commit 6ef07151aac4b4d9601d547f94a996d1c71b3871
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (6560d57ceebf122c7950e633ea7ed97b44351035)
Applying patch...

Failed to apply patch:
Applying: ethdev: support Tx queue used count
Using index info to reconstruct a base tree...
M	doc/guides/nics/features/default.ini
M	lib/ethdev/rte_ethdev.h
M	lib/ethdev/version.map
Falling back to patching base and 3-way merge...
Auto-merging lib/ethdev/version.map
CONFLICT (content): Merge conflict in lib/ethdev/version.map
Auto-merging lib/ethdev/rte_ethdev.h
Auto-merging doc/guides/nics/features/default.ini
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 ethdev: support Tx queue used 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 (6560d57ceebf122c7950e633ea7ed97b44351035)
Applying patch...

Failed to apply patch:
Applying: ethdev: support Tx queue used count
Using index info to reconstruct a base tree...
M	doc/guides/nics/features/default.ini
M	lib/ethdev/rte_ethdev.h
M	lib/ethdev/version.map
Falling back to patching base and 3-way merge...
Auto-merging lib/ethdev/version.map
CONFLICT (content): Merge conflict in lib/ethdev/version.map
Auto-merging lib/ethdev/rte_ethdev.h
Auto-merging doc/guides/nics/features/default.ini
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 ethdev: support Tx queue used 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/28848/

UNH-IOL DPDK Community Lab