|WARNING| pw156469 [PATCH] [v10, 1/1] ethdev: add support to provide link type

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Sunil Kumar Kori <skori at marvell.com>
Date: Monday, September 08 2025 08:51:48 
Applied on: CommitID:80f8d21b2dc80521c832a10f695015d8cd327b66
Apply patch set 156469 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 (80f8d21b2dc80521c832a10f695015d8cd327b66)
Done: main commit 80f8d21b2dc80521c832a10f695015d8cd327b66
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (3fb5e8045504d89de66c20b726e41446d507c21d)
Applying patch...

Failed to apply patch:
Applying: ethdev: add support to provide link type
Using index info to reconstruct a base tree...
M	app/test/test_ethdev_link.c
M	doc/guides/rel_notes/release_25_11.rst
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 doc/guides/rel_notes/release_25_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_25_11.rst
Auto-merging app/test/test_ethdev_link.c
CONFLICT (content): Merge conflict in app/test/test_ethdev_link.c
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 support to provide link type
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 (80f8d21b2dc80521c832a10f695015d8cd327b66)
Applying patch...

Failed to apply patch:
Applying: ethdev: add support to provide link type
Using index info to reconstruct a base tree...
M	app/test/test_ethdev_link.c
M	doc/guides/rel_notes/release_25_11.rst
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 doc/guides/rel_notes/release_25_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_25_11.rst
Auto-merging app/test/test_ethdev_link.c
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 support to provide link type
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/34031/

UNH-IOL DPDK Community Lab