* [dpdk-test-report] |FAILURE| pw(75461) [v4] doc: add section describing new abi versions
@ 2020-08-13 10:02 sys_stv
0 siblings, 0 replies; 2+ messages in thread
From: sys_stv @ 2020-08-13 10:02 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 904 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/75461
_apply issues_
Submitter: Ray Kinsella <mdr@ashroe.eu>
Date: 2020-08-12 11:26:02
Reply_mail: 1597231565-5094-1-git-send-email-mdr@ashroe.eu
DPDK git baseline:
Repo:dpdk, CommitID: b9b10ddb4292f2bc5524ae9f427a2795514eff02
* Repo: dpdk
CONFLICT (content): Merge conflict in doc/guides/contributing/abi_versioning.rst
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: add section describing new abi versions
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(75461) [v4] doc: add section describing new abi versions
@ 2020-08-13 6:08 sys_stv
0 siblings, 0 replies; 2+ messages in thread
From: sys_stv @ 2020-08-13 6:08 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 904 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/75461
_apply issues_
Submitter: Ray Kinsella <mdr@ashroe.eu>
Date: 2020-08-12 11:26:02
Reply_mail: 1597231565-5094-1-git-send-email-mdr@ashroe.eu
DPDK git baseline:
Repo:dpdk, CommitID: b9b10ddb4292f2bc5524ae9f427a2795514eff02
* Repo: dpdk
CONFLICT (content): Merge conflict in doc/guides/contributing/abi_versioning.rst
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: add section describing new abi versions
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-08-13 10:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-13 10:02 [dpdk-test-report] |FAILURE| pw(75461) [v4] doc: add section describing new abi versions sys_stv
-- strict thread matches above, loose matches on Subject: below --
2020-08-13 6:08 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).