* [dpdk-test-report] |FAILURE| pw(73461) [v2, 1/2] doc: reword abi policy for windows
@ 2020-07-08 16:23 sys_stv
0 siblings, 0 replies; only message in thread
From: sys_stv @ 2020-07-08 16:23 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 813 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/73461
_apply issues_
Submitter: Ray Kinsella <mdr@ashroe.eu>
Date: 2020-07-07 17:51:00
Reply_mail: 1594144262-5040-2-git-send-email-mdr@ashroe.eu
DPDK git baseline:
Repo:dpdk, CommitID: d25d116d9ccdf83b1b167cd9cedf9f7c0d7b61f2
* Repo: dpdk
Auto-merging doc/guides/contributing/abi_policy.rst
CONFLICT (content): Merge conflict in doc/guides/contributing/abi_policy.rst
error: Failed to merge in the changes.
Patch failed at 0001 doc: reword abi policy for windows
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-08 16:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-08 16:23 [dpdk-test-report] |FAILURE| pw(73461) [v2, 1/2] doc: reword abi policy for windows 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).