|WARNING| pw165260 [PATCH] [v5] net/iavf: fix duplicate VF reset during PF reset recovery

[dpdklab at iol.unh.edu]

Test-Label: iol-testing
Test-Status: WARNING
https://dpdk.org/patch/165260

_apply patch failure_

Submitter: Anurag Mandal <anurag.mandal at intel.com>
Date: Wednesday, June 10 2026 10:07:04 
Applied on: CommitID:c3ab467fe9bdf695bdc0e6a9d2bf5653f5013474
Apply patch set 165260 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 (c3ab467fe9bdf695bdc0e6a9d2bf5653f5013474)
Done: main commit c3ab467fe9bdf695bdc0e6a9d2bf5653f5013474
Trying to checkout branch: origin/next-net-intel-for-next-net
Checked out to next-net-intel-for-next-net (4f9d9fa0fbfce5963478b402ce7fa0d5ab0bf617)
Applying patch...

Failed to apply patch:
Applying: net/iavf: fix duplicate VF reset during PF reset recovery
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_26_07.rst
M	drivers/net/intel/iavf/iavf.h
M	drivers/net/intel/iavf/iavf_ethdev.c
M	drivers/net/intel/iavf/iavf_vchnl.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/iavf/iavf_vchnl.c
Auto-merging drivers/net/intel/iavf/iavf_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/intel/iavf/iavf_ethdev.c
Auto-merging drivers/net/intel/iavf/iavf.h
Auto-merging doc/guides/rel_notes/release_26_07.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 net/iavf: fix duplicate VF reset during PF reset recovery
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 (c3ab467fe9bdf695bdc0e6a9d2bf5653f5013474)
Applying patch...

Failed to apply patch:
Applying: net/iavf: fix duplicate VF reset during PF reset recovery
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_26_07.rst
M	drivers/net/intel/iavf/iavf.h
M	drivers/net/intel/iavf/iavf_ethdev.c
M	drivers/net/intel/iavf/iavf_vchnl.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/iavf/iavf_vchnl.c
Auto-merging drivers/net/intel/iavf/iavf_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/intel/iavf/iavf_ethdev.c
Auto-merging drivers/net/intel/iavf/iavf.h
Auto-merging doc/guides/rel_notes/release_26_07.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 net/iavf: fix duplicate VF reset during PF reset recovery
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/36213/

UNH-IOL DPDK Community Lab