|WARNING| pw152873 [PATCH] [v2] doc: reword flow offload and api docs

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Nandini Persad <nandinipersad361 at gmail.com>
Date: Thursday, April 10 2025 18:39:31 
Applied on: CommitID:ca1690ebd224f148268285b15b97441ccdbdd07e
Apply patch set 152873 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 (ca1690ebd224f148268285b15b97441ccdbdd07e)
Done: main commit ca1690ebd224f148268285b15b97441ccdbdd07e
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (b69fb7abb6d211cb74284029c6cdb2066b9ac0e9)
Applying patch...

Failed to apply patch:
Applying: doc: reword flow offload and api docs
Using index info to reconstruct a base tree...
M	doc/guides/prog_guide/ethdev/flow_offload.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/prog_guide/ethdev/flow_offload.rst
CONFLICT (content): Merge conflict in doc/guides/prog_guide/ethdev/flow_offload.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 doc: reword flow offload and api docs
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 (ca1690ebd224f148268285b15b97441ccdbdd07e)
Applying patch...

Failed to apply patch:
Applying: doc: reword flow offload and api docs
Using index info to reconstruct a base tree...
M	doc/guides/prog_guide/ethdev/flow_offload.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/prog_guide/ethdev/flow_offload.rst
CONFLICT (content): Merge conflict in doc/guides/prog_guide/ethdev/flow_offload.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 doc: reword flow offload and api docs
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/32991/

UNH-IOL DPDK Community Lab