|WARNING| pw157719-157733 [PATCH] [v2, 15/15] net/dpaa2: add Policer stats for each TC

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Prashant Gupta <prashant.gupta_3 at nxp.com>
Date: Thursday, October 16 2025 10:28:05 
Applied on: CommitID:16f4c522003dcfecf23c8d38e009b95a3bbefd03
Apply patch set 157719-157733 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 (16f4c522003dcfecf23c8d38e009b95a3bbefd03)
Done: main commit 16f4c522003dcfecf23c8d38e009b95a3bbefd03
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (791cea04798a8e2de014b99c009cd25b5929000a)
Applying patch...

Failed to apply patch:
Applying: net/dpaa2: fix uninitialized variable issue
Applying: net/dpaa2: fix to free buffers from error queue
Applying: net/dpaa2: fix L3/L4 csum results in packet parse
Applying: net/dpaa2: fix to recv packets with additional parse errors
Applying: net/dpaa2: fix error frame dump issue
Applying: net/dpaa2: fix flow rule's resizing issue
Applying: drivers: dpaa2 upgrade fslmc base FW to 10.39.0
Applying: net/dpaa2: add dpmac MC header file
Applying: net/dpaa2: support dpmac counters in stats
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_25_11.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_25_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_25_11.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0009 net/dpaa2: support dpmac counters in stats
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 (16f4c522003dcfecf23c8d38e009b95a3bbefd03)
Applying patch...

Failed to apply patch:
Applying: net/dpaa2: fix uninitialized variable issue
Applying: net/dpaa2: fix to free buffers from error queue
Applying: net/dpaa2: fix L3/L4 csum results in packet parse
Applying: net/dpaa2: fix to recv packets with additional parse errors
Applying: net/dpaa2: fix error frame dump issue
Applying: net/dpaa2: fix flow rule's resizing issue
Applying: drivers: dpaa2 upgrade fslmc base FW to 10.39.0
Applying: net/dpaa2: add dpmac MC header file
Applying: net/dpaa2: support dpmac counters in stats
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_25_11.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_25_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_25_11.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0009 net/dpaa2: support dpmac counters in stats
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/34298/

UNH-IOL DPDK Community Lab