|WARNING| pw158544-158545 [PATCH] [v1, 4/4] net/nbl: update documentation and maintainers

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Dimon Zhao <dimon.zhao at 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