* [dpdk-test-report] |FAILURE| pw(84500) doc: add tested platforms with Mellanox NICs
@ 2020-11-24 10:19 sys_stv
0 siblings, 0 replies; only message in thread
From: sys_stv @ 2020-11-24 10:19 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 876 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/84500
_apply issues_
Submitter: Raslan Darawsheh <rasland@nvidia.com>
Date: 2020-11-24 09:54:37
Reply_mail: 20201124095437.17517-1-rasland@nvidia.com
DPDK git baseline:
Repo:dpdk, CommitID: 61bd270c4adc7dff1f9c8af1f2c72618860d4395
* 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 doc: add tested platforms with Mellanox NICs
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-11-24 10:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-24 10:19 [dpdk-test-report] |FAILURE| pw(84500) doc: add tested platforms with Mellanox NICs 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).