|WARNING| pw154288-154290 [PATCH] [v3, 3/3] argparse: use enums to remove max-value defines in lists

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Bruce Richardson <bruce.richardson at intel.com>
Date: Tuesday, June 10 2025 16:29:38 
Applied on: CommitID:e3942de6c981e14a762185976a84cb02882699ed
Apply patch set 154288-154290 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 (e3942de6c981e14a762185976a84cb02882699ed)
Done: main commit e3942de6c981e14a762185976a84cb02882699ed
Trying to checkout branch: origin/main
Checked out to main (e3942de6c981e14a762185976a84cb02882699ed)
Applying patch...

Failed to apply patch:
Applying: argparse: add support for string and boolean args
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_25_07.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_25_07.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_25_07.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 argparse: add support for string and boolean args
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/33380/

UNH-IOL DPDK Community Lab