|WARNING| pw156266-156268 [PATCH] [RFC, 3/3] app/testpmd: support link state on close ethdev API

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Ciara Loftus <ciara.loftus at intel.com>
Date: Friday, August 29 2025 14:02:24 
Applied on: CommitID:f41d2db45d8a23c3315929c190d098154732a1ce
Apply patch set 156266-156268 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: ethdev: add set link state on close API
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_25_11.rst
M	lib/ethdev/ethdev_driver.h
M	lib/ethdev/rte_ethdev.c
M	lib/ethdev/rte_ethdev.h
Falling back to patching base and 3-way merge...
Auto-merging lib/ethdev/rte_ethdev.h
Auto-merging lib/ethdev/rte_ethdev.c
Auto-merging lib/ethdev/ethdev_driver.h
Auto-merging doc/guides/rel_notes/release_25_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_25_11.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ethdev: add set link state on close API
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: ethdev: add set link state on close API
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_25_11.rst
M	lib/ethdev/ethdev_driver.h
M	lib/ethdev/rte_ethdev.c
M	lib/ethdev/rte_ethdev.h
Falling back to patching base and 3-way merge...
Auto-merging lib/ethdev/rte_ethdev.h
Auto-merging lib/ethdev/rte_ethdev.c
Auto-merging lib/ethdev/ethdev_driver.h
Auto-merging doc/guides/rel_notes/release_25_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_25_11.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ethdev: add set link state on close API
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/33990/

UNH-IOL DPDK Community Lab