|FAILURE| pw171119-171123 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/171123

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

Failed to apply patch:
Applying: bus/platform: match device by devicetree compatible string
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_26_11.rst
M	drivers/bus/platform/bus_platform_driver.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/bus/platform/bus_platform_driver.h
CONFLICT (content): Merge conflict in drivers/bus/platform/bus_platform_driver.h
Auto-merging 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 0001 bus/platform: match device by devicetree compatible string
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: ['drivers/bus/platform/bus_platform_driver.h']
Non-.rst conflicts: ['drivers/bus/platform/bus_platform_driver.h']
FATAL: Patch apply failed with conflicts in non-.rst files: ['drivers/bus/platform/bus_platform_driver.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 (7f615af876ee32f967507429c18e053d0246223c)
Done: main commit 7f615af876ee32f967507429c18e053d0246223c
Trying to checkout branch: origin/main
Checked out to main (7f615af876ee32f967507429c18e053d0246223c)
Applying patch...
Applying: bus/platform: match device by devicetree compatible string
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_26_11.rst
M	drivers/bus/platform/bus_platform_driver.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/bus/platform/bus_platform_driver.h
CONFLICT (content): Merge conflict in drivers/bus/platform/bus_platform_driver.h
Auto-merging 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 0001 bus/platform: match device by devicetree compatible string
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: ['drivers/bus/platform/bus_platform_driver.h']
Non-.rst conflicts: ['drivers/bus/platform/bus_platform_driver.h']
FATAL: Patch apply failed with conflicts in non-.rst files: ['drivers/bus/platform/bus_platform_driver.h']
FAILURE