|WARNING| pw138959 [PATCH] maintainers: update for cpfl driver

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Zhang, Yuying <yuying.zhang at intel.com>
Date: Thursday, March 28 2024 16:06:38 
Applied on: CommitID:a9778aad62470a38ccbb4e09a2a6bf0cc2e0e36d
Apply patch set 138959 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 (a9778aad62470a38ccbb4e09a2a6bf0cc2e0e36d)
Done: main commit a9778aad62470a38ccbb4e09a2a6bf0cc2e0e36d
Trying to checkout branch: origin/main
Checked out to main (a9778aad62470a38ccbb4e09a2a6bf0cc2e0e36d)
Applying patch...

Failed to apply patch:
Applying: maintainers: update for cpfl driver
Using index info to reconstruct a base tree...
M	MAINTAINERS
Falling back to patching base and 3-way merge...
Auto-merging MAINTAINERS
CONFLICT (content): Merge conflict in MAINTAINERS
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 maintainers: update for cpfl driver
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/29677/

UNH-IOL DPDK Community Lab