|WARNING| pw137914 [PATCH] [v1] doc: fix aging poll frequency devargs information

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Ankur Dwivedi <adwivedi at marvell.com>
Date: Monday, March 04 2024 14:30:06 
Applied on: CommitID:cc7ce74402f29c5850eccc5828492135b91135cf
Apply patch set 137914 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 (5df34de5808a7b826b8bc035d6ee3161a12be364)
Done: main commit 5df34de5808a7b826b8bc035d6ee3161a12be364
Trying to checkout branch: origin/next-net-mrvl-for-main
Checked out to next-net-mrvl-for-main (cc7ce74402f29c5850eccc5828492135b91135cf)
Applying patch...

Failed to apply patch:
Applying: doc: fix aging poll frequency devargs information
Using index info to reconstruct a base tree...
M	doc/guides/nics/cnxk.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/nics/cnxk.rst
CONFLICT (content): Merge conflict in doc/guides/nics/cnxk.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 doc: fix aging poll frequency devargs information
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 (cc7ce74402f29c5850eccc5828492135b91135cf)
Applying patch...

Failed to apply patch:
Applying: doc: fix aging poll frequency devargs information
Using index info to reconstruct a base tree...
M	doc/guides/nics/cnxk.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/nics/cnxk.rst
CONFLICT (content): Merge conflict in doc/guides/nics/cnxk.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 doc: fix aging poll frequency devargs information
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/29404/

UNH-IOL DPDK Community Lab