From: al-sw-devops@alabs.net
To: test-report@dpdk.org, atrwajee@amazon.com
Subject: |FAILURE| pw154804-154821 Description: Apply error encountered
Date: Sat, 28 Jun 2025 21:11:09 +0300 (IDT) [thread overview]
Message-ID: <249711518.16155.1751134269313@ip-10-159-234-77.eu-west-1.compute.internal> (raw)
[-- Attachment #1: Type: text/plain, Size: 4686 bytes --]
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
reply other threads:[~2025-06-28 18:11 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=249711518.16155.1751134269313@ip-10-159-234-77.eu-west-1.compute.internal \
--to=al-sw-devops@alabs.net \
--cc=atrwajee@amazon.com \
--cc=test-report@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).