|FAILURE| pw159474-159474 Description: Apply error encountered

|FAILURE| pw159474-159474 Description: Apply error encountered

[al-sw-devops]

[-- Attachment #1: Type: text/plain, Size: 3317 bytes --]

Test-Name: DPDK Fast test suite
Test-Label: aws-unit-testing
Test-Status: FAILURE
_Unit Testing Apply error encountered_
http://dpdk.org/patch/159474

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

Failed to apply patch:
Applying: gro : improve GRO performance based on hash table
Using index info to reconstruct a base tree...
A	app/test/test_gro.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): app/test/test_gro.c deleted in HEAD and modified in gro : improve GRO performance based on hash table. Version gro : improve GRO performance based on hash table of app/test/test_gro.c left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 gro : improve GRO performance based on hash table
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 in .rst files...
Patch apply failed with conflicts in non-.rst files: ['app/test/test_gro.c']
FAILURE


Test environment (x86_64):
Description: Apply error encountered
OS : Ubuntu 24.04.1 LTS
Kernel : 6.14.0-1017-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 (cd60dcd503b91956f966a1f6d595b35d256ac00f)
Done: main commit cd60dcd503b91956f966a1f6d595b35d256ac00f
Trying to checkout branch: origin/main
Checked out to main (cd60dcd503b91956f966a1f6d595b35d256ac00f)
Applying patch...
Applying: gro : improve GRO performance based on hash table
Using index info to reconstruct a base tree...
A	app/test/test_gro.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): app/test/test_gro.c deleted in HEAD and modified in gro : improve GRO performance based on hash table. Version gro : improve GRO performance based on hash table of app/test/test_gro.c left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 gro : improve GRO performance based on hash table
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 in .rst files...
Patch apply failed with conflicts in non-.rst files: ['app/test/test_gro.c']
FAILURE