|WARNING| pw136505 [PATCH] [v4] ethdev: add template table resize API

|WARNING| pw136505 [PATCH] [v4] ethdev: add template table resize API

[dpdklab]

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

_apply patch failure_

Submitter: Gregory Etelson <getelson@nvidia.com>
Date: Wednesday, February 07 2024 17:36:47 
Applied on: CommitID:67d787e43c304dba6be55f0ce93df006d0997e48
Apply patch set 136505 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 (a4ce111cc89f580b8c4aad51bdb061acbdfde86b)
Done: main commit a4ce111cc89f580b8c4aad51bdb061acbdfde86b
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (67d787e43c304dba6be55f0ce93df006d0997e48)
Applying patch...

Failed to apply patch:
Applying: ethdev: add template table resize API
Using index info to reconstruct a base tree...
M	app/test-pmd/cmdline_flow.c
M	doc/guides/rel_notes/release_24_03.rst
M	doc/guides/testpmd_app_ug/testpmd_funcs.rst
M	lib/ethdev/ethdev_trace_points.c
M	lib/ethdev/rte_flow.c
M	lib/ethdev/rte_flow.h
M	lib/ethdev/rte_flow_driver.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_flow_driver.h
Auto-merging lib/ethdev/rte_flow.h
Auto-merging lib/ethdev/rte_flow.c
CONFLICT (content): Merge conflict in lib/ethdev/rte_flow.c
Auto-merging lib/ethdev/ethdev_trace_points.c
Auto-merging doc/guides/testpmd_app_ug/testpmd_funcs.rst
Auto-merging doc/guides/rel_notes/release_24_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst
Auto-merging app/test-pmd/cmdline_flow.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 ethdev: add template table resize API
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 (67d787e43c304dba6be55f0ce93df006d0997e48)
Applying patch...

Failed to apply patch:
Applying: ethdev: add template table resize API
Using index info to reconstruct a base tree...
M	app/test-pmd/cmdline_flow.c
M	doc/guides/rel_notes/release_24_03.rst
M	doc/guides/testpmd_app_ug/testpmd_funcs.rst
M	lib/ethdev/ethdev_trace_points.c
M	lib/ethdev/rte_flow.c
M	lib/ethdev/rte_flow.h
M	lib/ethdev/rte_flow_driver.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_flow_driver.h
Auto-merging lib/ethdev/rte_flow.h
Auto-merging lib/ethdev/rte_flow.c
CONFLICT (content): Merge conflict in lib/ethdev/rte_flow.c
Auto-merging lib/ethdev/ethdev_trace_points.c
Auto-merging doc/guides/testpmd_app_ug/testpmd_funcs.rst
Auto-merging doc/guides/rel_notes/release_24_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst
Auto-merging app/test-pmd/cmdline_flow.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 ethdev: add template table resize API
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/29088/

UNH-IOL DPDK Community Lab