From: sys_stv@intel.com
To: test-report@dpdk.org
Subject: [dpdk-test-report] |FAILURE| pw(76979) [v1, 3/3] lib/mirror: add flow based mirroring
Date: 08 Sep 2020 20:18:11 -0700 [thread overview]
Message-ID: <fecc85$b87h4p@orsmga001.jf.intel.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1138 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/76979
_apply issues_
Submitter: Patrick Fu <patrick.fu@intel.com>
Date: 2020-09-09 00:22:47
Reply_mail: 20200909002247.864844-4-patrick.fu@intel.com
DPDK git baseline:
Repo:dpdk, CommitID: 54fa1f6a67d711f38aae61a79b284a84ce80e561
* Repo: dpdk
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): lib/Makefile deleted in HEAD and modified in lib/mirror: introduce traffic mirror API. Version lib/mirror: introduce traffic mirror API of lib/Makefile left in tree.
CONFLICT (modify/delete): config/common_base deleted in HEAD and modified in lib/mirror: introduce traffic mirror API. Version lib/mirror: introduce traffic mirror API of config/common_base left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 lib/mirror: introduce traffic mirror API
Use 'git am --show-current-patch' to see the failed patch
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".
DPDK STV team
reply other threads:[~2020-09-09 3:18 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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='fecc85$b87h4p@orsmga001.jf.intel.com' \
--to=sys_stv@intel.com \
--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).