|WARNING| pw156460-156462 [PATCH] [4/4] common/sfc_efx/base: use saved netport FEC choice by default

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Ivan Malov <ivan.malov at arknetworks.am>
Date: Friday, September 05 2025 14:45:14 
Applied on: CommitID:f41d2db45d8a23c3315929c190d098154732a1ce
Apply patch set 156460-156462 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 (f41d2db45d8a23c3315929c190d098154732a1ce)
Done: main commit f41d2db45d8a23c3315929c190d098154732a1ce
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (027d974ef56f7312133934422ea0f8971c224603)
Applying patch...

Failed to apply patch:
Applying: common/sfc_efx/base: fix autoneg detection with netport MCDI
Using index info to reconstruct a base tree...
M	drivers/common/sfc_efx/base/efx_np.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/common/sfc_efx/base/efx_np.c
No changes -- Patch already applied.
Applying: common/sfc_efx/base: default to auto fcntl with netport MCDI
Using index info to reconstruct a base tree...
M	drivers/common/sfc_efx/base/efx_np.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/common/sfc_efx/base/efx_np.c
CONFLICT (content): Merge conflict in drivers/common/sfc_efx/base/efx_np.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 common/sfc_efx/base: default to auto fcntl with netport MCDI
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 (f41d2db45d8a23c3315929c190d098154732a1ce)
Applying patch...

Failed to apply patch:
Applying: common/sfc_efx/base: fix autoneg detection with netport MCDI
Using index info to reconstruct a base tree...
M	drivers/common/sfc_efx/base/efx_np.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/common/sfc_efx/base/efx_np.c
No changes -- Patch already applied.
Applying: common/sfc_efx/base: default to auto fcntl with netport MCDI
Using index info to reconstruct a base tree...
M	drivers/common/sfc_efx/base/efx_np.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/common/sfc_efx/base/efx_np.c
CONFLICT (content): Merge conflict in drivers/common/sfc_efx/base/efx_np.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 common/sfc_efx/base: default to auto fcntl with netport MCDI
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/34027/

UNH-IOL DPDK Community Lab