From: sys_stv@intel.com
To: test-report@dpdk.org
Subject: [dpdk-test-report] |FAILURE| pw(83577) [v4, 16/16] ethdev: include mbuf registration in Tx timestamp API
Date: 03 Nov 2020 08:10:22 -0800 [thread overview]
Message-ID: <569c58$g1itp9@orsmga005-auth.jf.intel.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 875 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/83577
_apply issues_
Submitter: Thomas Monjalon <thomas@monjalon.net>
Date: 2020-11-03 12:22:05
Reply_mail: 20201103122205.183472-17-thomas@monjalon.net
DPDK git baseline:
Repo:dpdk, CommitID: da02b0c304e9055bd3a31e1179679f87cdb9fd5b
* Repo: dpdk
CONFLICT (content): Merge conflict in lib/librte_mbuf/version.map
Auto-merging lib/librte_mbuf/rte_mbuf_dyn.c
CONFLICT (content): Merge conflict in lib/librte_mbuf/rte_mbuf_dyn.c
error: Failed to merge in the changes.
Patch failed at 0002 mbuf: add Rx timestamp flag and helpers
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-11-03 16:10 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='569c58$g1itp9@orsmga005-auth.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).