From: dpdklab@iol.unh.edu
To: test-report@dpdk.org
Cc: dpdk-test-reports@iol.unh.edu
Subject: |WARNING| pw138763 [PATCH] doc: add tested platforms with NVIDIA NICs
Date: Mon, 25 Mar 2024 00:43:23 -0700 (PDT) [thread overview]
Message-ID: <66012b1b.050a0220.c7db4.099eSMTPIN_ADDED_MISSING@mx.google.com> (raw)
In-Reply-To: <20240325072827.11920-1-rasland@nvidia.com>
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/138763
_apply patch failure_
Submitter: Raslan Darawsheh <rasland@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
prev parent reply other threads:[~2024-03-25 7:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20240325072827.11920-1-rasland@nvidia.com>
2024-03-25 7:06 ` qemudev
2024-03-25 7:30 ` |SUCCESS| " checkpatch
2024-03-25 7:43 ` dpdklab [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=66012b1b.050a0220.c7db4.099eSMTPIN_ADDED_MISSING@mx.google.com \
--to=dpdklab@iol.unh.edu \
--cc=dpdk-test-reports@iol.unh.edu \
--cc=test-report@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).