* [dpdk-test-report] |FAILURE| pw(81688) [v7, 14/14] doc: update patch cheatsheet to use meson
@ 2020-10-21 11:23 sys_stv
0 siblings, 0 replies; only message in thread
From: sys_stv @ 2020-10-21 11:23 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 844 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/81688
_apply issues_
Submitter: Ciara Power <ciara.power@intel.com>
Date: 2020-10-21 08:17:24
Reply_mail: 20201021081725.68541-15-ciara.power@intel.com
DPDK git baseline:
Repo:dpdk, CommitID: 4669252e0421aaf06ff86d5339f970ebe72cbf22
* Repo: dpdk
Auto-merging doc/guides/nics/memif.rst
CONFLICT (content): Merge conflict in doc/guides/nics/memif.rst
Auto-merging doc/guides/nics/bnxt.rst
error: Failed to merge in the changes.
Patch failed at 0003 doc: remove references to make from NICs guides
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-10-21 11:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-21 11:23 [dpdk-test-report] |FAILURE| pw(81688) [v7, 14/14] doc: update patch cheatsheet to use meson 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).