* [dpdk-test-report] |FAILURE| pw(80392) [v6] eal: add cache-line demote support
@ 2020-10-12 17:32 sys_stv
0 siblings, 0 replies; 2+ messages in thread
From: sys_stv @ 2020-10-12 17:32 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 887 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/80392
_apply issues_
Submitter: Omkar Maslekar <omkar.maslekar@intel.com>
Date: 2020-10-12 10:19:40
Reply_mail: 1602497980-20680-2-git-send-email-omkar.maslekar@intel.com
DPDK git baseline:
Repo:dpdk, CommitID: f4eb44f81d8c47d157523f893fbab9baeb38f9c1
* Repo: dpdk
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_20_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_11.rst
error: Failed to merge in the changes.
Patch failed at 0001 eal: add cache-line demote support
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] 2+ messages in thread
* [dpdk-test-report] |FAILURE| pw(80392) [v6] eal: add cache-line demote support
@ 2020-10-13 8:44 sys_stv
0 siblings, 0 replies; 2+ messages in thread
From: sys_stv @ 2020-10-13 8:44 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 887 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/80392
_apply issues_
Submitter: Omkar Maslekar <omkar.maslekar@intel.com>
Date: 2020-10-12 10:19:40
Reply_mail: 1602497980-20680-2-git-send-email-omkar.maslekar@intel.com
DPDK git baseline:
Repo:dpdk, CommitID: 7cf3d07c3adcb015c303e4cdf2ef9712a65ce46d
* Repo: dpdk
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_20_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_11.rst
error: Failed to merge in the changes.
Patch failed at 0001 eal: add cache-line demote support
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] 2+ messages in thread
end of thread, other threads:[~2020-10-13 8:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-12 17:32 [dpdk-test-report] |FAILURE| pw(80392) [v6] eal: add cache-line demote support sys_stv
2020-10-13 8:44 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).