|FAILURE| pw169994-170022 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/170022

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

Failed to apply patch:
Applying: uapi: update to v6.17 and add iommufd.h
Applying: vfio: make all functions internal
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_26_11.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_26_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_11.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 vfio: make all functions internal
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: ['doc/guides/rel_notes/release_26_11.rst']
Non-.rst conflicts: []
Only .rst files conflicted. Skipping patch and continuing...
Applying: bus/fslmc: decouple from EAL VFIO
Applying: vfio: decouple EAL from VFIO internals
Using index info to reconstruct a base tree...
M	lib/eal/freebsd/eal.c
M	lib/eal/include/rte_vfio.h
M	lib/eal/linux/eal_vfio.c
M	lib/eal/windows/eal.c
Falling back to patching base and 3-way merge...
Auto-merging lib/eal/windows/eal.c
Auto-merging lib/eal/linux/eal_vfio.c
Auto-merging lib/eal/include/rte_vfio.h
CONFLICT (content): Merge conflict in lib/eal/include/rte_vfio.h
Auto-merging lib/eal/freebsd/eal.c
CONFLICT (content): Merge conflict in lib/eal/freebsd/eal.c
Patch failed at 0004 vfio: decouple EAL from VFIO internals
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".

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch

Patch failed. Checking for conflicts...
Conflicted files: ['lib/eal/freebsd/eal.c', 'lib/eal/include/rte_vfio.h']
Non-.rst conflicts: ['lib/eal/freebsd/eal.c', 'lib/eal/include/rte_vfio.h']
FATAL: Patch apply failed with conflicts in non-.rst files: ['lib/eal/freebsd/eal.c', 'lib/eal/include/rte_vfio.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 (4f795ddd6a1fbdea97b7b254dea6d8f1f837a681)
Done: main commit 4f795ddd6a1fbdea97b7b254dea6d8f1f837a681
Trying to checkout branch: origin/main
Checked out to main (4f795ddd6a1fbdea97b7b254dea6d8f1f837a681)
Applying patch...
Applying: uapi: update to v6.17 and add iommufd.h
Applying: vfio: make all functions internal
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_26_11.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_26_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_11.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 vfio: make all functions internal
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: ['doc/guides/rel_notes/release_26_11.rst']
Non-.rst conflicts: []
Only .rst files conflicted. Skipping patch and continuing...
Applying: bus/fslmc: decouple from EAL VFIO
Applying: vfio: decouple EAL from VFIO internals
Using index info to reconstruct a base tree...
M	lib/eal/freebsd/eal.c
M	lib/eal/include/rte_vfio.h
M	lib/eal/linux/eal_vfio.c
M	lib/eal/windows/eal.c
Falling back to patching base and 3-way merge...
Auto-merging lib/eal/windows/eal.c
Auto-merging lib/eal/linux/eal_vfio.c
Auto-merging lib/eal/include/rte_vfio.h
CONFLICT (content): Merge conflict in lib/eal/include/rte_vfio.h
Auto-merging lib/eal/freebsd/eal.c
CONFLICT (content): Merge conflict in lib/eal/freebsd/eal.c
Patch failed at 0004 vfio: decouple EAL from VFIO internals
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".

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch

Patch failed. Checking for conflicts...
Conflicted files: ['lib/eal/freebsd/eal.c', 'lib/eal/include/rte_vfio.h']
Non-.rst conflicts: ['lib/eal/freebsd/eal.c', 'lib/eal/include/rte_vfio.h']
FATAL: Patch apply failed with conflicts in non-.rst files: ['lib/eal/freebsd/eal.c', 'lib/eal/include/rte_vfio.h']
FAILURE