|WARNING| pw135807 [PATCH] [v11] net/iavf: add diagnostic support in TX path

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Mingjin Ye <mingjinx.ye at intel.com>
Date: Tuesday, January 09 2024 10:09:57 
Applied on: CommitID:6ef07151aac4b4d9601d547f94a996d1c71b3871
Apply patch set 135807 failed:

Cloning the DPDK mirror at: https://github.com/DPDK/dpdk.git (Attempt 1 of 3)
Trying to checkout branch: main
Checked out to main
v23.11-44-g6ef0715
Done: main commit 6ef07151aac4b4d9601d547f94a996d1c71b3871
Applying patch...

Failed to apply patch:
Applying: net/iavf: add diagnostic support in TX path
Using index info to reconstruct a base tree...
M	doc/guides/nics/intel_vf.rst
M	drivers/net/iavf/iavf.h
M	drivers/net/iavf/iavf_ethdev.c
M	drivers/net/iavf/iavf_rxtx.c
M	drivers/net/iavf/iavf_rxtx.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/iavf/iavf_rxtx.h
Auto-merging drivers/net/iavf/iavf_rxtx.c
CONFLICT (content): Merge conflict in drivers/net/iavf/iavf_rxtx.c
Auto-merging drivers/net/iavf/iavf_ethdev.c
Auto-merging drivers/net/iavf/iavf.h
CONFLICT (content): Merge conflict in drivers/net/iavf/iavf.h
Auto-merging doc/guides/nics/intel_vf.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 net/iavf: add diagnostic support in TX path
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: main
Checked out to main
v23.11-44-g6ef0715
Applying patch...

Failed to apply patch:
Applying: net/iavf: add diagnostic support in TX path
Using index info to reconstruct a base tree...
M	doc/guides/nics/intel_vf.rst
M	drivers/net/iavf/iavf.h
M	drivers/net/iavf/iavf_ethdev.c
M	drivers/net/iavf/iavf_rxtx.c
M	drivers/net/iavf/iavf_rxtx.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/iavf/iavf_rxtx.h
Auto-merging drivers/net/iavf/iavf_rxtx.c
CONFLICT (content): Merge conflict in drivers/net/iavf/iavf_rxtx.c
Auto-merging drivers/net/iavf/iavf_ethdev.c
Auto-merging drivers/net/iavf/iavf.h
CONFLICT (content): Merge conflict in drivers/net/iavf/iavf.h
Auto-merging doc/guides/nics/intel_vf.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 net/iavf: add diagnostic support in TX path
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/28833/

UNH-IOL DPDK Community Lab