|FAILURE| pw164389-164391 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/164391

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

Failed to apply patch:
Applying: dma/ae4dma: introduce AMD AE4DMA DMA PMD
Using index info to reconstruct a base tree...
M	.mailmap
M	MAINTAINERS
M	doc/guides/rel_notes/release_26_07.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_26_07.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_07.rst
Auto-merging MAINTAINERS
Auto-merging .mailmap
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 dma/ae4dma: introduce AMD AE4DMA DMA PMD
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_07.rst']
Non-.rst conflicts: []
Only .rst files conflicted. Skipping patch and continuing...
Applying: dma/ae4dma: add control path operations
Using index info to reconstruct a base tree...
A	drivers/dma/ae4dma/ae4dma_dmadev.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): drivers/dma/ae4dma/ae4dma_dmadev.c deleted in HEAD and modified in dma/ae4dma: add control path operations. Version dma/ae4dma: add control path operations of drivers/dma/ae4dma/ae4dma_dmadev.c left in tree.
Patch failed at 0002 dma/ae4dma: add control path operations
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

Failed to skip patch
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 (2a742a221bee81518a344bb75c59373d0e7f2b59)
Done: main commit 2a742a221bee81518a344bb75c59373d0e7f2b59
Trying to checkout branch: origin/main
Checked out to main (2a742a221bee81518a344bb75c59373d0e7f2b59)
Applying patch...
Applying: dma/ae4dma: introduce AMD AE4DMA DMA PMD
Using index info to reconstruct a base tree...
M	.mailmap
M	MAINTAINERS
M	doc/guides/rel_notes/release_26_07.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_26_07.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_07.rst
Auto-merging MAINTAINERS
Auto-merging .mailmap
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 dma/ae4dma: introduce AMD AE4DMA DMA PMD
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_07.rst']
Non-.rst conflicts: []
Only .rst files conflicted. Skipping patch and continuing...
Applying: dma/ae4dma: add control path operations
Using index info to reconstruct a base tree...
A	drivers/dma/ae4dma/ae4dma_dmadev.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): drivers/dma/ae4dma/ae4dma_dmadev.c deleted in HEAD and modified in dma/ae4dma: add control path operations. Version dma/ae4dma: add control path operations of drivers/dma/ae4dma/ae4dma_dmadev.c left in tree.
Patch failed at 0002 dma/ae4dma: add control path operations
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

Failed to skip patch
FAILURE