|WARNING| pw164870 [PATCH] [v2] net/iavf: fix VF reset race and stale ARQ message handling

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Talluri Chaitanyababu <chaitanyababux.talluri at intel.com>
Date: Wednesday, June 03 2026 04:57:47 
Applied on: CommitID:24162fa4487a99562812d13da937ef0f6ec77d3a
Apply patch set 164870 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 (24162fa4487a99562812d13da937ef0f6ec77d3a)
Done: main commit 24162fa4487a99562812d13da937ef0f6ec77d3a
Trying to checkout branch: origin/next-net-intel-for-next-net
Checked out to next-net-intel-for-next-net (a53fd231583cc643dcda6d451032ef143fb21477)
Applying patch...

Failed to apply patch:
Applying: net/iavf: fix VF reset race and stale ARQ message handling
Using index info to reconstruct a base tree...
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
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 VF reset race and stale ARQ message handling
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 (24162fa4487a99562812d13da937ef0f6ec77d3a)
Applying patch...

Failed to apply patch:
Applying: net/iavf: fix VF reset race and stale ARQ message handling
Using index info to reconstruct a base tree...
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
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 VF reset race and stale ARQ message handling
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/36118/

UNH-IOL DPDK Community Lab