|WARNING| pw138763 [PATCH] doc: add tested platforms with NVIDIA NICs
dpdklab at iol.unh.edu
dpdklab at iol.unh.edu
Mon Mar 25 08:43:23 CET 2024
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/138763
_apply patch failure_
Submitter: Raslan Darawsheh <rasland at nvidia.com>
Date: Monday, March 25 2024 07:28:27
Applied on: CommitID:3ce30fc646084443eb06eb808c73e3312edc90d1
Apply patch set 138763 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 (3ce30fc646084443eb06eb808c73e3312edc90d1)
Done: main commit 3ce30fc646084443eb06eb808c73e3312edc90d1
Trying to checkout branch: origin/main
Checked out to main (3ce30fc646084443eb06eb808c73e3312edc90d1)
Applying patch...
Failed to apply patch:
Applying: doc: add tested platforms with NVIDIA NICs
Using index info to reconstruct a base tree...
M doc/guides/rel_notes/release_24_03.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_24_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 doc: add tested platforms with NVIDIA NICs
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/29645/
UNH-IOL DPDK Community Lab
More information about the test-report
mailing list