From: dpdklab@iol.unh.edu
To: test-report@dpdk.org
Cc: dpdk-test-reports@iol.unh.edu
Subject: |WARNING| pw154805-154820 [PATCH] [V3, 18/18] drivers/net: add hinic3 PMD build and doc files
Date: Sat, 28 Jun 2025 00:45:46 -0700 (PDT) [thread overview]
Message-ID: <685f9daa.170a0220.2710ca.ea79SMTPIN_ADDED_MISSING@mx.google.com> (raw)
In-Reply-To: <20250628072552.1311-19-wff_light@vip.163.com>
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/154820
_apply patch failure_
Submitter: Feifei Wang <wff_light@vip.163.com>
Date: Saturday, June 28 2025 07:25:41
Applied on: CommitID:2eca0f4cd5daf6cd54b8705f6f76f3003c923912
Apply patch set 154805-154820 failed:
Cloning the DPDK mirror at: https://github.com/DPDK/dpdk.git (Attempt 1 of 3)
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".
https://lab.dpdk.org/results/dashboard/patchsets/33532/
UNH-IOL DPDK Community Lab
prev parent reply other threads:[~2025-06-28 7:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20250628072552.1311-19-wff_light@vip.163.com>
2025-06-28 7:31 ` |SUCCESS| pw154820 [V3 " checkpatch
2025-06-28 7:45 ` dpdklab [this message]
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=685f9daa.170a0220.2710ca.ea79SMTPIN_ADDED_MISSING@mx.google.com \
--to=dpdklab@iol.unh.edu \
--cc=dpdk-test-reports@iol.unh.edu \
--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).