|FAILURE| pw164525-164525 Description: Apply error encountered

al-sw-devops at alabs.net al-sw-devops at alabs.net
Thu May 28 20:26:56 CEST 2026
Previous message (by thread): |SUCCESS| pw164524-164524 Description: SUCCESS
Next message (by thread): |SUCCESS| pw164526-164526 Description: SUCCESS
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Test-Name: DPDK Fast test suite
Test-Label: aws-unit-testing
Test-Status: FAILURE
_Unit Testing Apply error encountered _
https://dpdk.org/patch/164525

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 (85e03e3d30a58e3f80ee7bc14cf7b2f1ac915a5e)
Done: main commit 85e03e3d30a58e3f80ee7bc14cf7b2f1ac915a5e
Trying to checkout branch: origin/next-crypto-for-main
Checked out to next-crypto-for-main (28ef4299acfd28df6ddcdad4bbc06916e88108ee)
Applying patch...

Failed to apply patch:
Applying: app/crypto-perf: support ML DSA
Using index info to reconstruct a base tree...
M	app/test-crypto-perf/cperf_ops.c
M	app/test-crypto-perf/cperf_options.h
M	app/test-crypto-perf/cperf_options_parsing.c
M	app/test-crypto-perf/cperf_test_common.c
M	app/test-crypto-perf/cperf_test_vectors.c
M	app/test-crypto-perf/cperf_test_vectors.h
M	app/test-crypto-perf/main.c
Falling back to patching base and 3-way merge...
Auto-merging app/test-crypto-perf/main.c
CONFLICT (content): Merge conflict in app/test-crypto-perf/main.c
Auto-merging app/test-crypto-perf/cperf_test_vectors.h
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_test_vectors.h
Auto-merging app/test-crypto-perf/cperf_test_vectors.c
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_test_vectors.c
Auto-merging app/test-crypto-perf/cperf_test_common.c
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_test_common.c
Auto-merging app/test-crypto-perf/cperf_options_parsing.c
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_options_parsing.c
Auto-merging app/test-crypto-perf/cperf_options.h
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_options.h
Auto-merging app/test-crypto-perf/cperf_ops.c
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_ops.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 app/crypto-perf: support ML DSA
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: ['app/test-crypto-perf/cperf_ops.c', 'app/test-crypto-perf/cperf_options.h', 'app/test-crypto-perf/cperf_options_parsing.c', 'app/test-crypto-perf/cperf_test_common.c', 'app/test-crypto-perf/cperf_test_vectors.c', 'app/test-crypto-perf/cperf_test_vectors.h', 'app/test-crypto-perf/main.c']
Non-.rst conflicts: ['app/test-crypto-perf/cperf_ops.c', 'app/test-crypto-perf/cperf_options.h', 'app/test-crypto-perf/cperf_options_parsing.c', 'app/test-crypto-perf/cperf_test_common.c', 'app/test-crypto-perf/cperf_test_vectors.c', 'app/test-crypto-perf/cperf_test_vectors.h', 'app/test-crypto-perf/main.c']
FATAL: Patch apply failed with conflicts in non-.rst files: ['app/test-crypto-perf/cperf_ops.c', 'app/test-crypto-perf/cperf_options.h', 'app/test-crypto-perf/cperf_options_parsing.c', 'app/test-crypto-perf/cperf_test_common.c', 'app/test-crypto-perf/cperf_test_vectors.c', 'app/test-crypto-perf/cperf_test_vectors.h', 'app/test-crypto-perf/main.c']
Trying to checkout branch: origin/main
Checked out to main (85e03e3d30a58e3f80ee7bc14cf7b2f1ac915a5e)
Applying patch...

Failed to apply patch:
Applying: app/crypto-perf: support ML DSA
Using index info to reconstruct a base tree...
M	app/test-crypto-perf/cperf_ops.c
M	app/test-crypto-perf/cperf_options.h
M	app/test-crypto-perf/cperf_options_parsing.c
M	app/test-crypto-perf/cperf_test_common.c
M	app/test-crypto-perf/cperf_test_vectors.c
M	app/test-crypto-perf/cperf_test_vectors.h
M	app/test-crypto-perf/main.c
Falling back to patching base and 3-way merge...
Auto-merging app/test-crypto-perf/main.c
CONFLICT (content): Merge conflict in app/test-crypto-perf/main.c
Auto-merging app/test-crypto-perf/cperf_test_vectors.h
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_test_vectors.h
Auto-merging app/test-crypto-perf/cperf_test_vectors.c
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_test_vectors.c
Auto-merging app/test-crypto-perf/cperf_test_common.c
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_test_common.c
Auto-merging app/test-crypto-perf/cperf_options_parsing.c
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_options_parsing.c
Auto-merging app/test-crypto-perf/cperf_options.h
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_options.h
Auto-merging app/test-crypto-perf/cperf_ops.c
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_ops.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 app/crypto-perf: support ML DSA
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: ['app/test-crypto-perf/cperf_ops.c', 'app/test-crypto-perf/cperf_options.h', 'app/test-crypto-perf/cperf_options_parsing.c', 'app/test-crypto-perf/cperf_test_common.c', 'app/test-crypto-perf/cperf_test_vectors.c', 'app/test-crypto-perf/cperf_test_vectors.h', 'app/test-crypto-perf/main.c']
Non-.rst conflicts: ['app/test-crypto-perf/cperf_ops.c', 'app/test-crypto-perf/cperf_options.h', 'app/test-crypto-perf/cperf_options_parsing.c', 'app/test-crypto-perf/cperf_test_common.c', 'app/test-crypto-perf/cperf_test_vectors.c', 'app/test-crypto-perf/cperf_test_vectors.h', 'app/test-crypto-perf/main.c']
FATAL: Patch apply failed with conflicts in non-.rst files: ['app/test-crypto-perf/cperf_ops.c', 'app/test-crypto-perf/cperf_options.h', 'app/test-crypto-perf/cperf_options_parsing.c', 'app/test-crypto-perf/cperf_test_common.c', 'app/test-crypto-perf/cperf_test_vectors.c', 'app/test-crypto-perf/cperf_test_vectors.h', 'app/test-crypto-perf/main.c']
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 (85e03e3d30a58e3f80ee7bc14cf7b2f1ac915a5e)
Done: main commit 85e03e3d30a58e3f80ee7bc14cf7b2f1ac915a5e
Trying to checkout branch: origin/next-crypto-for-main
Checked out to next-crypto-for-main (28ef4299acfd28df6ddcdad4bbc06916e88108ee)
Applying patch...
Applying: app/crypto-perf: support ML DSA
Using index info to reconstruct a base tree...
M	app/test-crypto-perf/cperf_ops.c
M	app/test-crypto-perf/cperf_options.h
M	app/test-crypto-perf/cperf_options_parsing.c
M	app/test-crypto-perf/cperf_test_common.c
M	app/test-crypto-perf/cperf_test_vectors.c
M	app/test-crypto-perf/cperf_test_vectors.h
M	app/test-crypto-perf/main.c
Falling back to patching base and 3-way merge...
Auto-merging app/test-crypto-perf/main.c
CONFLICT (content): Merge conflict in app/test-crypto-perf/main.c
Auto-merging app/test-crypto-perf/cperf_test_vectors.h
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_test_vectors.h
Auto-merging app/test-crypto-perf/cperf_test_vectors.c
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_test_vectors.c
Auto-merging app/test-crypto-perf/cperf_test_common.c
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_test_common.c
Auto-merging app/test-crypto-perf/cperf_options_parsing.c
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_options_parsing.c
Auto-merging app/test-crypto-perf/cperf_options.h
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_options.h
Auto-merging app/test-crypto-perf/cperf_ops.c
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_ops.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 app/crypto-perf: support ML DSA
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: ['app/test-crypto-perf/cperf_ops.c', 'app/test-crypto-perf/cperf_options.h', 'app/test-crypto-perf/cperf_options_parsing.c', 'app/test-crypto-perf/cperf_test_common.c', 'app/test-crypto-perf/cperf_test_vectors.c', 'app/test-crypto-perf/cperf_test_vectors.h', 'app/test-crypto-perf/main.c']
Non-.rst conflicts: ['app/test-crypto-perf/cperf_ops.c', 'app/test-crypto-perf/cperf_options.h', 'app/test-crypto-perf/cperf_options_parsing.c', 'app/test-crypto-perf/cperf_test_common.c', 'app/test-crypto-perf/cperf_test_vectors.c', 'app/test-crypto-perf/cperf_test_vectors.h', 'app/test-crypto-perf/main.c']
FATAL: Patch apply failed with conflicts in non-.rst files: ['app/test-crypto-perf/cperf_ops.c', 'app/test-crypto-perf/cperf_options.h', 'app/test-crypto-perf/cperf_options_parsing.c', 'app/test-crypto-perf/cperf_test_common.c', 'app/test-crypto-perf/cperf_test_vectors.c', 'app/test-crypto-perf/cperf_test_vectors.h', 'app/test-crypto-perf/main.c']
Trying to checkout branch: origin/main
Checked out to main (85e03e3d30a58e3f80ee7bc14cf7b2f1ac915a5e)
Applying patch...
Applying: app/crypto-perf: support ML DSA
Using index info to reconstruct a base tree...
M	app/test-crypto-perf/cperf_ops.c
M	app/test-crypto-perf/cperf_options.h
M	app/test-crypto-perf/cperf_options_parsing.c
M	app/test-crypto-perf/cperf_test_common.c
M	app/test-crypto-perf/cperf_test_vectors.c
M	app/test-crypto-perf/cperf_test_vectors.h
M	app/test-crypto-perf/main.c
Falling back to patching base and 3-way merge...
Auto-merging app/test-crypto-perf/main.c
CONFLICT (content): Merge conflict in app/test-crypto-perf/main.c
Auto-merging app/test-crypto-perf/cperf_test_vectors.h
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_test_vectors.h
Auto-merging app/test-crypto-perf/cperf_test_vectors.c
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_test_vectors.c
Auto-merging app/test-crypto-perf/cperf_test_common.c
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_test_common.c
Auto-merging app/test-crypto-perf/cperf_options_parsing.c
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_options_parsing.c
Auto-merging app/test-crypto-perf/cperf_options.h
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_options.h
Auto-merging app/test-crypto-perf/cperf_ops.c
CONFLICT (content): Merge conflict in app/test-crypto-perf/cperf_ops.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 app/crypto-perf: support ML DSA
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: ['app/test-crypto-perf/cperf_ops.c', 'app/test-crypto-perf/cperf_options.h', 'app/test-crypto-perf/cperf_options_parsing.c', 'app/test-crypto-perf/cperf_test_common.c', 'app/test-crypto-perf/cperf_test_vectors.c', 'app/test-crypto-perf/cperf_test_vectors.h', 'app/test-crypto-perf/main.c']
Non-.rst conflicts: ['app/test-crypto-perf/cperf_ops.c', 'app/test-crypto-perf/cperf_options.h', 'app/test-crypto-perf/cperf_options_parsing.c', 'app/test-crypto-perf/cperf_test_common.c', 'app/test-crypto-perf/cperf_test_vectors.c', 'app/test-crypto-perf/cperf_test_vectors.h', 'app/test-crypto-perf/main.c']
FATAL: Patch apply failed with conflicts in non-.rst files: ['app/test-crypto-perf/cperf_ops.c', 'app/test-crypto-perf/cperf_options.h', 'app/test-crypto-perf/cperf_options_parsing.c', 'app/test-crypto-perf/cperf_test_common.c', 'app/test-crypto-perf/cperf_test_vectors.c', 'app/test-crypto-perf/cperf_test_vectors.h', 'app/test-crypto-perf/main.c']
FAILURE
Previous message (by thread): |SUCCESS| pw164524-164524 Description: SUCCESS
Next message (by thread): |SUCCESS| pw164526-164526 Description: SUCCESS
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the test-report mailing list