|WARNING| pw155123-155136 [PATCH] [v5, 14/14] net/sxe: add Solve compilation problems.

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Jie Liu <liujie5 at linkdatatechnology.com>
Date: Thursday, July 10 2025 01:20:21 
Applied on: CommitID:9fe9c0b231c8da5435bfccb1963121b4277f961c
Apply patch set 155123-155136 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 (9fe9c0b231c8da5435bfccb1963121b4277f961c)
Done: main commit 9fe9c0b231c8da5435bfccb1963121b4277f961c
Trying to checkout branch: origin/main
Checked out to main (9fe9c0b231c8da5435bfccb1963121b4277f961c)
Applying patch...

Failed to apply patch:
Applying: net/sxe: add base driver directory and doc
Using index info to reconstruct a base tree...
M	MAINTAINERS
M	doc/guides/nics/index.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/nics/index.rst
CONFLICT (content): Merge conflict in doc/guides/nics/index.rst
Auto-merging MAINTAINERS
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/sxe: add base driver directory and doc
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/33631/

UNH-IOL DPDK Community Lab