From: dpdklab@iol.unh.edu
To: test-report@dpdk.org
Cc: dpdk-test-reports@iol.unh.edu
Subject: |WARNING| pw138959 [PATCH] maintainers: update for cpfl driver
Date: Thu, 28 Mar 2024 09:40:07 -0700 (PDT) [thread overview]
Message-ID: <66059d67.050a0220.9b85e.3bf5SMTPIN_ADDED_MISSING@mx.google.com> (raw)
In-Reply-To: <20240328160638.1345980-1-yuying.zhang@intel.com>
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/138959
_apply patch failure_
Submitter: Zhang, Yuying <yuying.zhang@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
prev parent reply other threads:[~2024-03-28 16:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20240328160638.1345980-1-yuying.zhang@intel.com>
2024-03-28 16:05 ` |WARNING| pw138959 [DPDK] " qemudev
2024-03-28 16:07 ` |SUCCESS| " checkpatch
2024-03-28 16:40 ` 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=66059d67.050a0220.9b85e.3bf5SMTPIN_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).