|WARNING| pw136031-136033 [PATCH] [v2, 3/3] dts: add API doc generation

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Juraj Linkes <juraj.linkes at pantheon.tech>
Date: Monday, January 22 2024 12:00:47 
Applied on: CommitID:c858f006d1f7161986c88847259a400d8f80d81b
Apply patch set 136031-136033 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 (515e1a4f4cddd33fcb35328a73449d30a8edfaf6)
Done: main commit 515e1a4f4cddd33fcb35328a73449d30a8edfaf6
Trying to checkout branch: origin/next-baseband-for-main
Checked out to next-baseband-for-main (c858f006d1f7161986c88847259a400d8f80d81b)
Applying patch...

Failed to apply patch:
Applying: dts: add doc generation dependencies
Using index info to reconstruct a base tree...
M	dts/poetry.lock
M	dts/pyproject.toml
Falling back to patching base and 3-way merge...
Auto-merging dts/pyproject.toml
Auto-merging dts/poetry.lock
CONFLICT (content): Merge conflict in dts/poetry.lock
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 dts: add doc generation dependencies
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 (c858f006d1f7161986c88847259a400d8f80d81b)
Applying patch...

Failed to apply patch:
Applying: dts: add doc generation dependencies
Using index info to reconstruct a base tree...
M	dts/poetry.lock
M	dts/pyproject.toml
Falling back to patching base and 3-way merge...
Auto-merging dts/pyproject.toml
Auto-merging dts/poetry.lock
CONFLICT (content): Merge conflict in dts/poetry.lock
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 dts: add doc generation dependencies
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/28930/

UNH-IOL DPDK Community Lab