* [dpdk-test-report] |FAILURE| pw(83607) [v5, 16/16] ethdev: include mbuf registration in Tx timestamp API
@ 2020-11-03 18:37 sys_stv
0 siblings, 0 replies; only message in thread
From: sys_stv @ 2020-11-03 18:37 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 875 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/83607
_apply issues_
Submitter: Thomas Monjalon <thomas@monjalon.net>
Date: 2020-11-03 14:09:31
Reply_mail: 20201103140931.488700-17-thomas@monjalon.net
DPDK git baseline:
Repo:dpdk, CommitID: 8809f78c7dd9f33a44a4f89c58fc91ded34296ed
* 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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-11-03 18:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-03 18:37 [dpdk-test-report] |FAILURE| pw(83607) [v5, 16/16] ethdev: include mbuf registration in Tx timestamp API sys_stv
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).