|FAILURE| pw159776-159793 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/159793

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

Failed to apply patch:
Applying: lpm: restrict name size
Applying: hash: add checks for hash name length
Applying: graph: avoid overflowing comment buffer
Applying: latencystats: add check for string overflow
Applying: telemetry: check for path overflow
Applying: efd: handle possible name truncation
Applying: eal: use C library to parse filesystem table
Applying: eal: warn if thread name is truncated
Applying: eal: avoid format overflow when handling addresses
Applying: eal: add check for sysfs path overflow
Applying: eal: limit maximum runtime directory and socket paths
Applying: eal: check for hugefile path overflow
Applying: eal: check tailq length
Applying: eal: handle long shared library path
Using index info to reconstruct a base tree...
M	lib/eal/common/eal_common_options.c
Falling back to patching base and 3-way merge...
Auto-merging lib/eal/common/eal_common_options.c
CONFLICT (content): Merge conflict in lib/eal/common/eal_common_options.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0014 eal: handle long shared library path
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: ['lib/eal/common/eal_common_options.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 (636b16520de5c12c22ae2171c764877969373bf6)
Done: main commit 636b16520de5c12c22ae2171c764877969373bf6
Trying to checkout branch: origin/main
Checked out to main (636b16520de5c12c22ae2171c764877969373bf6)
Applying patch...
Applying: lpm: restrict name size
Applying: hash: add checks for hash name length
Applying: graph: avoid overflowing comment buffer
Applying: latencystats: add check for string overflow
Applying: telemetry: check for path overflow
Applying: efd: handle possible name truncation
Applying: eal: use C library to parse filesystem table
Applying: eal: warn if thread name is truncated
Applying: eal: avoid format overflow when handling addresses
Applying: eal: add check for sysfs path overflow
Applying: eal: limit maximum runtime directory and socket paths
Applying: eal: check for hugefile path overflow
Applying: eal: check tailq length
Applying: eal: handle long shared library path
Using index info to reconstruct a base tree...
M	lib/eal/common/eal_common_options.c
Falling back to patching base and 3-way merge...
Auto-merging lib/eal/common/eal_common_options.c
CONFLICT (content): Merge conflict in lib/eal/common/eal_common_options.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0014 eal: handle long shared library path
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: ['lib/eal/common/eal_common_options.c']
FAILURE