|WARNING| pw154805-154820 [PATCH] [V3, 18/18] drivers/net: add hinic3 PMD build and doc files

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Feifei Wang <wff_light at vip.163.com>
Date: Saturday, June 28 2025 07:25:41 
Applied on: CommitID:2eca0f4cd5daf6cd54b8705f6f76f3003c923912
Apply patch set 154805-154820 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 (2eca0f4cd5daf6cd54b8705f6f76f3003c923912)
Done: main commit 2eca0f4cd5daf6cd54b8705f6f76f3003c923912
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (62428fc90bb6f4ad678024ce8183702b534dc570)
Applying patch...

Failed to apply patch:
Applying: add some basic files about hinic3 driver
Using index info to reconstruct a base tree...
M	.mailmap
M	doc/guides/rel_notes/release_25_07.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_25_07.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_25_07.rst
Auto-merging .mailmap
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 add some basic files about hinic3 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".


Trying to checkout branch: origin/main
Checked out to main (2eca0f4cd5daf6cd54b8705f6f76f3003c923912)
Applying patch...

Failed to apply patch:
Applying: add some basic files about hinic3 driver
Using index info to reconstruct a base tree...
M	.mailmap
M	doc/guides/rel_notes/release_25_07.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_25_07.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_25_07.rst
Auto-merging .mailmap
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 add some basic files about hinic3 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/33532/

UNH-IOL DPDK Community Lab