From: dpdklab@iol.unh.edu
To: test-report@dpdk.org
Cc: dpdk-test-reports@iol.unh.edu
Subject: |WARNING| pw156249-156262 [PATCH] [14/14] net/xsc: update release notes for xsc PMD
Date: Wed, 10 Sep 2025 00:17:12 -0700 (PDT) [thread overview]
Message-ID: <68c125f8.170a0220.1d87be.8c33SMTPIN_ADDED_MISSING@mx.google.com> (raw)
In-Reply-To: <20250829082438.24369-15-wanry@yunsilicon.com>
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/156262
_apply patch failure_
Submitter: Renyong Wan <wanry@yunsilicon.com>
Date: Friday, August 29 2025 08:24:40
Applied on: CommitID:f41d2db45d8a23c3315929c190d098154732a1ce
Apply patch set 156249-156262 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 (f41d2db45d8a23c3315929c190d098154732a1ce)
Done: main commit f41d2db45d8a23c3315929c190d098154732a1ce
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (027d974ef56f7312133934422ea0f8971c224603)
Applying patch...
Failed to apply patch:
Applying: net/xsc: add FW version get support
Using index info to reconstruct a base tree...
M doc/guides/nics/features/xsc.ini
M drivers/net/xsc/xsc_dev.c
M drivers/net/xsc/xsc_dev.h
M drivers/net/xsc/xsc_ethdev.c
M drivers/net/xsc/xsc_vfio.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/xsc/xsc_vfio.c
Auto-merging drivers/net/xsc/xsc_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/xsc/xsc_ethdev.c
Auto-merging drivers/net/xsc/xsc_dev.h
CONFLICT (content): Merge conflict in drivers/net/xsc/xsc_dev.h
Auto-merging drivers/net/xsc/xsc_dev.c
CONFLICT (content): Merge conflict in drivers/net/xsc/xsc_dev.c
Auto-merging doc/guides/nics/features/xsc.ini
CONFLICT (content): Merge conflict in doc/guides/nics/features/xsc.ini
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 net/xsc: add FW version get support
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 (f41d2db45d8a23c3315929c190d098154732a1ce)
Applying patch...
Failed to apply patch:
Applying: net/xsc: add FW version get support
Using index info to reconstruct a base tree...
M doc/guides/nics/features/xsc.ini
M drivers/net/xsc/xsc_dev.c
M drivers/net/xsc/xsc_dev.h
M drivers/net/xsc/xsc_ethdev.c
M drivers/net/xsc/xsc_vfio.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/xsc/xsc_vfio.c
Auto-merging drivers/net/xsc/xsc_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/xsc/xsc_ethdev.c
Auto-merging drivers/net/xsc/xsc_dev.h
CONFLICT (content): Merge conflict in drivers/net/xsc/xsc_dev.h
Auto-merging drivers/net/xsc/xsc_dev.c
CONFLICT (content): Merge conflict in drivers/net/xsc/xsc_dev.c
Auto-merging doc/guides/nics/features/xsc.ini
CONFLICT (content): Merge conflict in doc/guides/nics/features/xsc.ini
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 net/xsc: add FW version get support
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/33987/
UNH-IOL DPDK Community Lab
prev parent reply other threads:[~2025-09-10 7:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20250829082438.24369-15-wanry@yunsilicon.com>
2025-08-29 7:57 ` |SUCCESS| pw156249-156262 [PATCH 14/14] " qemudev
2025-08-29 8:03 ` qemudev
2025-08-29 8:24 ` |SUCCESS| pw156262 " checkpatch
2025-08-29 9:45 ` 0-day Robot
2025-09-10 7:17 ` 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=68c125f8.170a0220.1d87be.8c33SMTPIN_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).