|WARNING| pw136637-136640 [PATCH] [v3, 4/4] app/testpmd: add encap hash calculation

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Ori Kam <orika at nvidia.com>
Date: Tuesday, February 13 2024 13:48:33 
Applied on: CommitID:7c75d453b719989092e0a53f0c049dc6c247bec0
Apply patch set 136637-136640 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 (74fff67a34a33c8e6565cfbcb5618c268eb388c6)
Done: main commit 74fff67a34a33c8e6565cfbcb5618c268eb388c6
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (7c75d453b719989092e0a53f0c049dc6c247bec0)
Applying patch...

Failed to apply patch:
Applying: ethdev: introduce encap hash calculation
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_24_03.rst
M	lib/ethdev/rte_flow.c
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
Auto-merging lib/ethdev/rte_flow_driver.h
Auto-merging lib/ethdev/rte_flow.c
CONFLICT (content): Merge conflict in lib/ethdev/rte_flow.c
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 ethdev: introduce encap hash calculation
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 (7c75d453b719989092e0a53f0c049dc6c247bec0)
Applying patch...

Failed to apply patch:
Applying: ethdev: introduce encap hash calculation
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_24_03.rst
M	lib/ethdev/rte_flow.c
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
Auto-merging lib/ethdev/rte_flow_driver.h
Auto-merging lib/ethdev/rte_flow.c
CONFLICT (content): Merge conflict in lib/ethdev/rte_flow.c
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 ethdev: introduce encap hash calculation
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/29131/

UNH-IOL DPDK Community Lab