* [dpdk-test-report] |FAILURE| pw(84114) [v10, 15/15] config: fix Arm implementer and its SoCs
@ 2020-11-13 11:21 sys_stv
0 siblings, 0 replies; only message in thread
From: sys_stv @ 2020-11-13 11:21 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 846 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/84114
_apply issues_
Submitter: Juraj Linkeš <juraj.linkes@pantheon.tech>
Date: 2020-11-13 11:09:49
Reply_mail: 1605265789-12932-16-git-send-email-juraj.linkes@pantheon.tech
DPDK git baseline:
Repo:dpdk, CommitID: 40892ddb3968ef7a5bb1318d177e8d7268313fff
* Repo: dpdk
Falling back to patching base and 3-way merge...
Auto-merging meson_options.txt
CONFLICT (content): Merge conflict in meson_options.txt
error: Failed to merge in the changes.
Patch failed at 0014 build: add Arm SoC meson option
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-13 11:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-13 11:21 [dpdk-test-report] |FAILURE| pw(84114) [v10, 15/15] config: fix Arm implementer and its SoCs 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).