|WARNING| pw156249-156262 [PATCH] [14/14] net/xsc: update release notes for xsc PMD

[dpdklab at iol.unh.edu]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/156262

_apply patch failure_

Submitter: Renyong Wan <wanry at 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