|FAILURE| pw165267-165268 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/165268

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 (611ef29e2c768bcede197996ddd9c5a37cf1a243)
Done: main commit 611ef29e2c768bcede197996ddd9c5a37cf1a243
Trying to checkout branch: origin/main
Checked out to main (611ef29e2c768bcede197996ddd9c5a37cf1a243)
Applying patch...

Failed to apply patch:
Applying: ring: split single thread vs multi-thread cases
Using index info to reconstruct a base tree...
M	lib/ring/rte_ring_c11_pvt.h
M	lib/ring/rte_ring_elem_pvt.h
A	lib/ring/rte_ring_generic_pvt.h
M	lib/ring/soring.c
Falling back to patching base and 3-way merge...
Auto-merging lib/ring/soring.c
CONFLICT (modify/delete): lib/ring/rte_ring_generic_pvt.h deleted in HEAD and modified in ring: split single thread vs multi-thread cases. Version ring: split single thread vs multi-thread cases of lib/ring/rte_ring_generic_pvt.h left in tree.
Auto-merging lib/ring/rte_ring_elem_pvt.h
Auto-merging lib/ring/rte_ring_c11_pvt.h
CONFLICT (content): Merge conflict in lib/ring/rte_ring_c11_pvt.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ring: split single thread vs multi-thread cases
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/ring/rte_ring_c11_pvt.h', 'lib/ring/rte_ring_generic_pvt.h']
Non-.rst conflicts: ['lib/ring/rte_ring_c11_pvt.h', 'lib/ring/rte_ring_generic_pvt.h']
FATAL: Patch apply failed with conflicts in non-.rst files: ['lib/ring/rte_ring_c11_pvt.h', 'lib/ring/rte_ring_generic_pvt.h']
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 (611ef29e2c768bcede197996ddd9c5a37cf1a243)
Done: main commit 611ef29e2c768bcede197996ddd9c5a37cf1a243
Trying to checkout branch: origin/main
Checked out to main (611ef29e2c768bcede197996ddd9c5a37cf1a243)
Applying patch...
Applying: ring: split single thread vs multi-thread cases
Using index info to reconstruct a base tree...
M	lib/ring/rte_ring_c11_pvt.h
M	lib/ring/rte_ring_elem_pvt.h
A	lib/ring/rte_ring_generic_pvt.h
M	lib/ring/soring.c
Falling back to patching base and 3-way merge...
Auto-merging lib/ring/soring.c
CONFLICT (modify/delete): lib/ring/rte_ring_generic_pvt.h deleted in HEAD and modified in ring: split single thread vs multi-thread cases. Version ring: split single thread vs multi-thread cases of lib/ring/rte_ring_generic_pvt.h left in tree.
Auto-merging lib/ring/rte_ring_elem_pvt.h
Auto-merging lib/ring/rte_ring_c11_pvt.h
CONFLICT (content): Merge conflict in lib/ring/rte_ring_c11_pvt.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ring: split single thread vs multi-thread cases
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/ring/rte_ring_c11_pvt.h', 'lib/ring/rte_ring_generic_pvt.h']
Non-.rst conflicts: ['lib/ring/rte_ring_c11_pvt.h', 'lib/ring/rte_ring_generic_pvt.h']
FATAL: Patch apply failed with conflicts in non-.rst files: ['lib/ring/rte_ring_c11_pvt.h', 'lib/ring/rte_ring_generic_pvt.h']
FAILURE