From: dpdklab@iol.unh.edu
To: test-report@dpdk.org
Cc: dpdk-test-reports@iol.unh.edu
Subject: |WARNING| pw158544-158545 [PATCH] [v1, 4/4] net/nbl: update documentation and maintainers
Date: Wed, 12 Nov 2025 10:02:36 -0800 (PST) [thread overview]
Message-ID: <6914cbbc.050a0220.40dcd.6726SMTPIN_ADDED_MISSING@mx.google.com> (raw)
In-Reply-To: <20251107073459.3532524-5-dimon.zhao@nebula-matrix.com>
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/158545
_apply patch failure_
Submitter: Dimon Zhao <dimon.zhao@nebula-matrix.com>
Date: Friday, November 07 2025 07:34:59
Applied on: CommitID:be0112878b4fc3a1b918370ed2fe615c52039d77
Apply patch set 158544-158545 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 (be0112878b4fc3a1b918370ed2fe615c52039d77)
Done: main commit be0112878b4fc3a1b918370ed2fe615c52039d77
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (29807269854f9bfc72f1323273de8e23adc724d4)
Applying patch...
Failed to apply patch:
Applying: net/nbl: change default Rx extension header size to 12 bytes
Using index info to reconstruct a base tree...
M drivers/net/nbl/nbl_dev/nbl_dev.c
M drivers/net/nbl/nbl_dev/nbl_dev.h
M drivers/net/nbl/nbl_hw/nbl_resource.h
M drivers/net/nbl/nbl_hw/nbl_txrx.c
M drivers/net/nbl/nbl_include/nbl_include.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/nbl/nbl_include/nbl_include.h
Auto-merging drivers/net/nbl/nbl_hw/nbl_txrx.c
CONFLICT (content): Merge conflict in drivers/net/nbl/nbl_hw/nbl_txrx.c
Auto-merging drivers/net/nbl/nbl_hw/nbl_resource.h
Auto-merging drivers/net/nbl/nbl_dev/nbl_dev.h
Auto-merging drivers/net/nbl/nbl_dev/nbl_dev.c
CONFLICT (content): Merge conflict in drivers/net/nbl/nbl_dev/nbl_dev.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 net/nbl: change default Rx extension header size to 12 bytes
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 (be0112878b4fc3a1b918370ed2fe615c52039d77)
Applying patch...
Failed to apply patch:
Applying: net/nbl: change default Rx extension header size to 12 bytes
Using index info to reconstruct a base tree...
M drivers/net/nbl/nbl_dev/nbl_dev.c
M drivers/net/nbl/nbl_dev/nbl_dev.h
M drivers/net/nbl/nbl_hw/nbl_resource.h
M drivers/net/nbl/nbl_hw/nbl_txrx.c
M drivers/net/nbl/nbl_include/nbl_include.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/nbl/nbl_include/nbl_include.h
Auto-merging drivers/net/nbl/nbl_hw/nbl_txrx.c
CONFLICT (content): Merge conflict in drivers/net/nbl/nbl_hw/nbl_txrx.c
Auto-merging drivers/net/nbl/nbl_hw/nbl_resource.h
Auto-merging drivers/net/nbl/nbl_dev/nbl_dev.h
Auto-merging drivers/net/nbl/nbl_dev/nbl_dev.c
CONFLICT (content): Merge conflict in drivers/net/nbl/nbl_dev/nbl_dev.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 net/nbl: change default Rx extension header size to 12 bytes
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/34556/
UNH-IOL DPDK Community Lab
prev parent reply other threads:[~2025-11-12 18:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20251107073459.3532524-5-dimon.zhao@nebula-matrix.com>
2025-11-07 7:00 ` |SUCCESS| pw158544-158545 [PATCH v1 " qemudev
2025-11-07 7:05 ` qemudev
2025-11-07 7:36 ` |SUCCESS| pw158545 " checkpatch
2025-11-12 18:02 ` 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=6914cbbc.050a0220.40dcd.6726SMTPIN_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).