|WARNING| pw158536-158541 [PATCH] [v8, 6/6] net/cnxk: report link mode

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Sunil Kumar Kori <skori at marvell.com>
Date: Friday, November 07 2025 07:03:24 
Applied on: CommitID:be0112878b4fc3a1b918370ed2fe615c52039d77
Apply patch set 158536-158541 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-mrvl-for-main
Checked out to next-net-mrvl-for-main (1bed0f396ad304b9acab546ab68627110eeb4b27)
Applying patch...

Failed to apply patch:
Applying: common/cnxk: support link mode configuration
Using index info to reconstruct a base tree...
M	drivers/common/cnxk/hw/nix.h
M	drivers/common/cnxk/roc_mbox.h
M	drivers/common/cnxk/roc_nix.h
M	drivers/common/cnxk/roc_nix_mac.c
M	drivers/common/cnxk/roc_nix_priv.h
M	drivers/common/cnxk/roc_platform_base_symbols.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/common/cnxk/roc_nix_mac.c
CONFLICT (content): Merge conflict in drivers/common/cnxk/roc_nix_mac.c
Auto-merging drivers/common/cnxk/roc_nix.h
CONFLICT (content): Merge conflict in drivers/common/cnxk/roc_nix.h
Auto-merging drivers/common/cnxk/roc_mbox.h
Auto-merging drivers/common/cnxk/hw/nix.h
CONFLICT (content): Merge conflict in drivers/common/cnxk/hw/nix.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 common/cnxk: support link mode configuration
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: common/cnxk: support link mode configuration
Using index info to reconstruct a base tree...
M	drivers/common/cnxk/hw/nix.h
M	drivers/common/cnxk/roc_mbox.h
M	drivers/common/cnxk/roc_nix.h
M	drivers/common/cnxk/roc_nix_mac.c
M	drivers/common/cnxk/roc_nix_priv.h
M	drivers/common/cnxk/roc_platform_base_symbols.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/common/cnxk/roc_nix_mac.c
CONFLICT (content): Merge conflict in drivers/common/cnxk/roc_nix_mac.c
Auto-merging drivers/common/cnxk/roc_nix.h
CONFLICT (content): Merge conflict in drivers/common/cnxk/roc_nix.h
Auto-merging drivers/common/cnxk/roc_mbox.h
Auto-merging drivers/common/cnxk/hw/nix.h
CONFLICT (content): Merge conflict in drivers/common/cnxk/hw/nix.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 common/cnxk: support link mode configuration
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/34557/

UNH-IOL DPDK Community Lab