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

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Nandini Persad <nandinipersad361 at gmail.com>
Date: Monday, March 31 2025 21:40:36 
Applied on: CommitID:edd3f4b1265e6da707c46ca9b6c39d332647baea
Apply patch set 152698 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 (edd3f4b1265e6da707c46ca9b6c39d332647baea)
Done: main commit edd3f4b1265e6da707c46ca9b6c39d332647baea
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (f3cb237103aada7bc83fd3f40929fb6fb3e58c3b)
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 (edd3f4b1265e6da707c46ca9b6c39d332647baea)
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/32916/

UNH-IOL DPDK Community Lab