|FAILURE| pw164428-164429 Description: Apply error encountered

[al-sw-devops at alabs.net]

Test-Name: DPDK Fast test suite
Test-Label: aws-unit-testing
Test-Status: FAILURE
_Unit Testing Apply error encountered _
https://dpdk.org/patch/164429

Test Status Summary:

+--------------+------------------+
| Architecture | DPDK Unit Test   |
+--------------+------------------+
| x86_64       | FAILURE           |
+--------------+------------------+
| arm64        | FAILURE           |
+--------------+------------------+


Test environment (aarch64):
Description: Apply error encountered
OS : Ubuntu 24.04.1 LTS
Kernel : 6.17.0-1007-aws
NIC : Elastic Network Adapter
GCC : 13.3.0-6ubuntu2~24.04

Test last 100 lines (aarch64)
Cleaning repository state...
Trying to checkout branch: origin/main
Checked out to main (9cf7c64abe4b8320fb498647a2216b5a9dc729c3)
Done: main commit 9cf7c64abe4b8320fb498647a2216b5a9dc729c3
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (41ca5d2ac6d032abe125f8165f54bdc6ab5f9972)
Applying patch...

Failed to apply patch:
Applying: ethdev: fix out-of-bounds write in GENEVE option conversion
Using index info to reconstruct a base tree...
M	lib/ethdev/rte_flow.c
Falling back to patching base and 3-way merge...
Auto-merging lib/ethdev/rte_flow.c
CONFLICT (content): Merge conflict in lib/ethdev/rte_flow.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ethdev: fix out-of-bounds write in GENEVE option conversion
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".


Patch failed. Checking for conflicts...
Conflicted files: ['lib/ethdev/rte_flow.c']
Non-.rst conflicts: ['lib/ethdev/rte_flow.c']
FATAL: Patch apply failed with conflicts in non-.rst files: ['lib/ethdev/rte_flow.c']
Trying to checkout branch: origin/main
Checked out to main (9cf7c64abe4b8320fb498647a2216b5a9dc729c3)
Applying patch...

Failed to apply patch:
Applying: ethdev: fix out-of-bounds write in GENEVE option conversion
Using index info to reconstruct a base tree...
M	lib/ethdev/rte_flow.c
Falling back to patching base and 3-way merge...
Auto-merging lib/ethdev/rte_flow.c
CONFLICT (content): Merge conflict in lib/ethdev/rte_flow.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ethdev: fix out-of-bounds write in GENEVE option conversion
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".


Patch failed. Checking for conflicts...
Conflicted files: ['lib/ethdev/rte_flow.c']
Non-.rst conflicts: ['lib/ethdev/rte_flow.c']
FATAL: Patch apply failed with conflicts in non-.rst files: ['lib/ethdev/rte_flow.c']
FAILURE


Test environment (x86_64):
Description: Apply error encountered
OS : Ubuntu 24.04.3 LTS
Kernel : 6.17.0-1007-aws
NIC : Elastic Network Adapter
GCC : 13.3.0-6ubuntu2~24.04

Test last 100 lines (x86_64)
Cleaning repository state...
Trying to checkout branch: origin/main
Checked out to main (9cf7c64abe4b8320fb498647a2216b5a9dc729c3)
Done: main commit 9cf7c64abe4b8320fb498647a2216b5a9dc729c3
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (41ca5d2ac6d032abe125f8165f54bdc6ab5f9972)
Applying patch...
Applying: ethdev: fix out-of-bounds write in GENEVE option conversion
Using index info to reconstruct a base tree...
M	lib/ethdev/rte_flow.c
Falling back to patching base and 3-way merge...
Auto-merging lib/ethdev/rte_flow.c
CONFLICT (content): Merge conflict in lib/ethdev/rte_flow.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ethdev: fix out-of-bounds write in GENEVE option conversion
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".



Patch failed. Checking for conflicts...
Conflicted files: ['lib/ethdev/rte_flow.c']
Non-.rst conflicts: ['lib/ethdev/rte_flow.c']
FATAL: Patch apply failed with conflicts in non-.rst files: ['lib/ethdev/rte_flow.c']
Trying to checkout branch: origin/main
Checked out to main (9cf7c64abe4b8320fb498647a2216b5a9dc729c3)
Applying patch...
Applying: ethdev: fix out-of-bounds write in GENEVE option conversion
Using index info to reconstruct a base tree...
M	lib/ethdev/rte_flow.c
Falling back to patching base and 3-way merge...
Auto-merging lib/ethdev/rte_flow.c
CONFLICT (content): Merge conflict in lib/ethdev/rte_flow.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ethdev: fix out-of-bounds write in GENEVE option conversion
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".



Patch failed. Checking for conflicts...
Conflicted files: ['lib/ethdev/rte_flow.c']
Non-.rst conflicts: ['lib/ethdev/rte_flow.c']
FATAL: Patch apply failed with conflicts in non-.rst files: ['lib/ethdev/rte_flow.c']
FAILURE