|FAILURE| pw154804-154821 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_
http://dpdk.org/patch/154821

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.8.0-1030-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 (2eca0f4cd5daf6cd54b8705f6f76f3003c923912)
Done: main commit 2eca0f4cd5daf6cd54b8705f6f76f3003c923912
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (62428fc90bb6f4ad678024ce8183702b534dc570)
Applying patch...

Failed to apply patch:
Applying: add some basic files about hinic3 driver
Using index info to reconstruct a base tree...
M	.mailmap
M	doc/guides/rel_notes/release_25_07.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_25_07.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_25_07.rst
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 add some basic files about hinic3 driver
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".


Trying to checkout branch: origin/main
Checked out to main (2eca0f4cd5daf6cd54b8705f6f76f3003c923912)
Applying patch...

Failed to apply patch:
Applying: add some basic files about hinic3 driver
Using index info to reconstruct a base tree...
M	.mailmap
M	doc/guides/rel_notes/release_25_07.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_25_07.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_25_07.rst
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 add some basic files about hinic3 driver
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".


FAILURE


Test environment (x86_64):
Description: Apply error encountered
OS : Ubuntu 24.04.1 LTS
Kernel : 6.8.0-1029-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 (2eca0f4cd5daf6cd54b8705f6f76f3003c923912)
Done: main commit 2eca0f4cd5daf6cd54b8705f6f76f3003c923912
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (62428fc90bb6f4ad678024ce8183702b534dc570)
Applying patch...
Applying: add some basic files about hinic3 driver
Using index info to reconstruct a base tree...
M	.mailmap
M	doc/guides/rel_notes/release_25_07.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_25_07.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_25_07.rst
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 add some basic files about hinic3 driver
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".



Trying to checkout branch: origin/main
Checked out to main (2eca0f4cd5daf6cd54b8705f6f76f3003c923912)
Applying patch...
Applying: add some basic files about hinic3 driver
Using index info to reconstruct a base tree...
M	.mailmap
M	doc/guides/rel_notes/release_25_07.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_25_07.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_25_07.rst
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 add some basic files about hinic3 driver
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".



FAILURE