|FAILURE| pw171209-171237 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/171237

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

Failed to apply patch:
Applying: bpf: replace deprecated SMP barriers with C11 fences
Using index info to reconstruct a base tree...
M	lib/bpf/bpf_pkt.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: bus/vmbus: remove packed attribute from ring buffer
Using index info to reconstruct a base tree...
M	drivers/bus/vmbus/rte_vmbus_reg.h
M	drivers/bus/vmbus/vmbus_bufring.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/bus/vmbus/vmbus_bufring.c
No changes -- Patch already applied.
Applying: bus/vmbus: fix ring buffer ordering on weakly ordered CPUs
Using index info to reconstruct a base tree...
M	drivers/bus/vmbus/vmbus_bufring.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/bus/vmbus/vmbus_bufring.c
No changes -- Patch already applied.
Applying: bus/vmbus: fix missing acquire on receive ring index
Using index info to reconstruct a base tree...
M	drivers/bus/vmbus/private.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: bus/vmbus: replace SMP barriers with C11 memory fences
Using index info to reconstruct a base tree...
M	drivers/bus/vmbus/vmbus_bufring.c
M	drivers/bus/vmbus/vmbus_channel.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drivers/baseband: convert rte_smp_rmb to fence
Using index info to reconstruct a base tree...
M	drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
M	drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: net/hinic: replace rte_smp_rmb
Using index info to reconstruct a base tree...
M	drivers/net/hinic/base/hinic_pmd_cmdq.c
M	drivers/net/hinic/base/hinic_pmd_mgmt.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: net/intel: replace rte_smp_rmb
Using index info to reconstruct a base tree...
M	drivers/net/intel/ice/ice_rxtx.c
M	drivers/net/intel/ixgbe/ixgbe_rxtx.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: net/virtio: replace rte_smp_rmb
Using index info to reconstruct a base tree...
M	drivers/net/virtio/virtqueue.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/virtio/virtqueue.h
No changes -- Patch already applied.
Applying: net/thunderx: replace deprecated SMP barriers
Using index info to reconstruct a base tree...
M	drivers/net/thunderx/base/nicvf_hw.c
M	drivers/net/thunderx/base/nicvf_plat.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: stack: always use C11 memory model implementation
Using index info to reconstruct a base tree...
M	lib/stack/meson.build
M	lib/stack/rte_stack_lf.h
A	lib/stack/rte_stack_lf_generic.h
Falling back to patching base and 3-way merge...
CONFLICT (rename/delete): lib/stack/rte_stack_lf_generic.h deleted in stack: always use C11 memory model implementation and renamed to lib/stack/rte_stack_lf_c11.h in HEAD. Version HEAD of lib/stack/rte_stack_lf_c11.h left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0011 stack: always use C11 memory model implementation
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/stack/rte_stack_lf_c11.h']
Non-.rst conflicts: ['lib/stack/rte_stack_lf_c11.h']
FATAL: Patch apply failed with conflicts in non-.rst files: ['lib/stack/rte_stack_lf_c11.h']
FAILURE


Test environment (x86_64):
Description: Apply error encountered
OS : Ubuntu 24.04.3 LTS
Kernel : 7.0.0-1011-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 (34e15083a1a9fc43914256a90521755c876646a5)
Done: main commit 34e15083a1a9fc43914256a90521755c876646a5
Trying to checkout branch: origin/main
Checked out to main (34e15083a1a9fc43914256a90521755c876646a5)
Applying patch...
Applying: bpf: replace deprecated SMP barriers with C11 fences
Using index info to reconstruct a base tree...
M	lib/bpf/bpf_pkt.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: bus/vmbus: remove packed attribute from ring buffer
Using index info to reconstruct a base tree...
M	drivers/bus/vmbus/rte_vmbus_reg.h
M	drivers/bus/vmbus/vmbus_bufring.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/bus/vmbus/vmbus_bufring.c
No changes -- Patch already applied.
Applying: bus/vmbus: fix ring buffer ordering on weakly ordered CPUs
Using index info to reconstruct a base tree...
M	drivers/bus/vmbus/vmbus_bufring.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/bus/vmbus/vmbus_bufring.c
No changes -- Patch already applied.
Applying: bus/vmbus: fix missing acquire on receive ring index
Using index info to reconstruct a base tree...
M	drivers/bus/vmbus/private.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: bus/vmbus: replace SMP barriers with C11 memory fences
Using index info to reconstruct a base tree...
M	drivers/bus/vmbus/vmbus_bufring.c
M	drivers/bus/vmbus/vmbus_channel.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drivers/baseband: convert rte_smp_rmb to fence
Using index info to reconstruct a base tree...
M	drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
M	drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: net/hinic: replace rte_smp_rmb
Using index info to reconstruct a base tree...
M	drivers/net/hinic/base/hinic_pmd_cmdq.c
M	drivers/net/hinic/base/hinic_pmd_mgmt.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: net/intel: replace rte_smp_rmb
Using index info to reconstruct a base tree...
M	drivers/net/intel/ice/ice_rxtx.c
M	drivers/net/intel/ixgbe/ixgbe_rxtx.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: net/virtio: replace rte_smp_rmb
Using index info to reconstruct a base tree...
M	drivers/net/virtio/virtqueue.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/virtio/virtqueue.h
No changes -- Patch already applied.
Applying: net/thunderx: replace deprecated SMP barriers
Using index info to reconstruct a base tree...
M	drivers/net/thunderx/base/nicvf_hw.c
M	drivers/net/thunderx/base/nicvf_plat.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: stack: always use C11 memory model implementation
Using index info to reconstruct a base tree...
M	lib/stack/meson.build
M	lib/stack/rte_stack_lf.h
A	lib/stack/rte_stack_lf_generic.h
Falling back to patching base and 3-way merge...
CONFLICT (rename/delete): lib/stack/rte_stack_lf_generic.h deleted in stack: always use C11 memory model implementation and renamed to lib/stack/rte_stack_lf_c11.h in HEAD. Version HEAD of lib/stack/rte_stack_lf_c11.h left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0011 stack: always use C11 memory model implementation
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/stack/rte_stack_lf_c11.h']
Non-.rst conflicts: ['lib/stack/rte_stack_lf_c11.h']
FATAL: Patch apply failed with conflicts in non-.rst files: ['lib/stack/rte_stack_lf_c11.h']
FAILURE