From: dpdklab@iol.unh.edu
To: test-report@dpdk.org
Cc: dpdk-test-reports@iol.unh.edu
Subject: |WARNING| pw157719-157733 [PATCH] [v2, 15/15] net/dpaa2: add Policer stats for each TC
Date: Thu, 16 Oct 2025 03:41:45 -0700 (PDT) [thread overview]
Message-ID: <68f0cbe9.050a0220.1e84f8.8dddSMTPIN_ADDED_MISSING@mx.google.com> (raw)
In-Reply-To: <20251016102805.2453687-16-prashant.gupta_3@nxp.com>
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/157733
_apply patch failure_
Submitter: Prashant Gupta <prashant.gupta_3@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
prev parent reply other threads:[~2025-10-16 10:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20251016102805.2453687-16-prashant.gupta_3@nxp.com>
2025-10-16 10:29 ` |SUCCESS| pw157733 [PATCH v2 " checkpatch
2025-10-16 10:41 ` dpdklab [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=68f0cbe9.050a0220.1e84f8.8dddSMTPIN_ADDED_MISSING@mx.google.com \
--to=dpdklab@iol.unh.edu \
--cc=dpdk-test-reports@iol.unh.edu \
--cc=test-report@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).