|FAILURE| pw166664-166664 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/166664

Test Status Summary:

+--------------+------------------+
| Architecture | DPDK Unit Test   |
+--------------+------------------+
| x86_64       | Not Tested           |
+--------------+------------------+
| 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 (5c08545afdf7af282317939bd71fe45d563ec261)
Done: main commit 5c08545afdf7af282317939bd71fe45d563ec261
Trying to checkout branch: origin/next-dts-for-main
Checked out to next-dts-for-main (ba132d7358617367e50cd1998c90c9e1d5339c1c)
Applying patch...

Failed to apply patch:
Applying: dts: add support for no link topology
Using index info to reconstruct a base tree...
M	dts/api/test.py
M	dts/configurations/test_run.example.yaml
M	dts/framework/config/__init__.py
M	dts/framework/config/test_run.py
M	dts/framework/context.py
M	dts/framework/remote_session/dpdk.py
M	dts/framework/runner.py
M	dts/framework/test_run.py
M	dts/framework/testbed_model/topology.py
Falling back to patching base and 3-way merge...
Auto-merging dts/framework/test_run.py
CONFLICT (content): Merge conflict in dts/framework/test_run.py
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 dts: add support for no link topology
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: ['dts/framework/test_run.py']
Non-.rst conflicts: ['dts/framework/test_run.py']
FATAL: Patch apply failed with conflicts in non-.rst files: ['dts/framework/test_run.py']
Trying to checkout branch: origin/main
Checked out to main (5c08545afdf7af282317939bd71fe45d563ec261)
Applying patch...

Failed to apply patch:
Applying: dts: add support for no link topology
Using index info to reconstruct a base tree...
M	dts/framework/config/__init__.py
M	dts/framework/config/test_run.py
M	dts/framework/context.py
Falling back to patching base and 3-way merge...
Auto-merging dts/framework/context.py
Auto-merging dts/framework/config/test_run.py
Auto-merging dts/framework/config/__init__.py
CONFLICT (content): Merge conflict in dts/framework/config/__init__.py
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 dts: add support for no link topology
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: ['dts/framework/config/__init__.py']
Non-.rst conflicts: ['dts/framework/config/__init__.py']
FATAL: Patch apply failed with conflicts in non-.rst files: ['dts/framework/config/__init__.py']
FAILURE