* [dpdk-test-report] |FAILURE| pw(74939) [v3] doc: add deprecation notice for sched changes
@ 2020-07-28 18:33 sys_stv
0 siblings, 0 replies; only message in thread
From: sys_stv @ 2020-07-28 18:33 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 903 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/74939
_apply issues_
Submitter: Savinay Dharmappa <savinay.dharmappa@intel.com>
Date: 2020-07-28 14:43:45
Reply_mail: 1595947425-60076-1-git-send-email-savinay.dharmappa@intel.com
DPDK git baseline:
Repo:dpdk, CommitID: f6d099d7da83fb973f6849161795d08842d0d328
* Repo: dpdk
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/deprecation.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/deprecation.rst
error: Failed to merge in the changes.
Patch failed at 0001 doc: add deprecation notice for sched changes
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-28 18:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-28 18:33 [dpdk-test-report] |FAILURE| pw(74939) [v3] doc: add deprecation notice for sched changes 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).