* [dpdk-test-report] |FAILURE| pw(75056) [06/27] event/dlb: add dynamic logging
@ 2020-07-30 20:30 sys_stv
0 siblings, 0 replies; only message in thread
From: sys_stv @ 2020-07-30 20:30 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 891 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/75056
_apply issues_
Submitter: McDaniel, Timothy <timothy.mcdaniel@intel.com>
Date: 2020-07-30 19:49:53
Reply_mail: 1596138614-17409-7-git-send-email-timothy.mcdaniel@intel.com
DPDK git baseline:
Repo:dpdk, CommitID: 544f35c334e5c0b99b4d2f93ca6d38fb7e1299d6
* Repo: dpdk
Auto-merging drivers/event/dpaa2/dpaa2_eventdev.c
CONFLICT (content): Merge conflict in drivers/event/dpaa2/dpaa2_eventdev.c
Auto-merging drivers/event/dpaa/dpaa_eventdev.c
error: Failed to merge in the changes.
Patch failed at 0001 eventdev: dlb upstream prerequisites
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-07-30 20:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-30 20:30 [dpdk-test-report] |FAILURE| pw(75056) [06/27] event/dlb: add dynamic logging 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).