* [dpdk-test-report] |FAILURE| pw(80774) [v6, 18/18] examples: replace master lcore with main lcore
@ 2020-10-14 23:05 sys_stv
0 siblings, 0 replies; only message in thread
From: sys_stv @ 2020-10-14 23:05 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 880 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/80774
_apply issues_
Submitter: Stephen Hemminger <stephen@networkplumber.org>
Date: 2020-10-14 15:27:56
Reply_mail: 20201014152756.6518-19-stephen@networkplumber.org
DPDK git baseline:
Repo:dpdk, CommitID: f4cbdbc7fbd2cf352d50f5ce7018a63dc5392b1b
* Repo: dpdk
Auto-merging doc/guides/rel_notes/release_20_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_11.rst
Auto-merging doc/guides/rel_notes/deprecation.rst
error: Failed to merge in the changes.
Patch failed at 0003 eal: rename lcore word choices
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-14 23:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-14 23:05 [dpdk-test-report] |FAILURE| pw(80774) [v6, 18/18] examples: replace master lcore with main lcore 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).