* [dpdk-test-report] |FAILURE| pw(84329) [v2, 4/4] doc: add VFIO troubleshooting section
@ 2020-11-19 9:49 sys_stv
0 siblings, 0 replies; 2+ messages in thread
From: sys_stv @ 2020-11-19 9:49 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 920 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/84329
_apply issues_
Submitter: Anatoly Burakov <anatoly.burakov@intel.com>
Date: 2020-11-18 15:37:38
Reply_mail: d3941b43dcc1862f097515a4b727198fd45c2bc1.1605713845.git.anatoly.burakov@intel.com
DPDK git baseline:
Repo:dpdk, CommitID: 2069f9eefca06190377bbff14734e2326439df42
* Repo: dpdk
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/linux_gsg/linux_drivers.rst
CONFLICT (content): Merge conflict in doc/guides/linux_gsg/linux_drivers.rst
error: Failed to merge in the changes.
Patch failed at 0002 doc: reword VFIO and UIO Linux GSG section
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(84329) [v2, 4/4] doc: add VFIO troubleshooting section
@ 2020-11-18 15:41 sys_stv
0 siblings, 0 replies; 2+ messages in thread
From: sys_stv @ 2020-11-18 15:41 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 920 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/84329
_apply issues_
Submitter: Anatoly Burakov <anatoly.burakov@intel.com>
Date: 2020-11-18 15:37:38
Reply_mail: d3941b43dcc1862f097515a4b727198fd45c2bc1.1605713845.git.anatoly.burakov@intel.com
DPDK git baseline:
Repo:dpdk, CommitID: 2069f9eefca06190377bbff14734e2326439df42
* Repo: dpdk
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/linux_gsg/linux_drivers.rst
CONFLICT (content): Merge conflict in doc/guides/linux_gsg/linux_drivers.rst
error: Failed to merge in the changes.
Patch failed at 0002 doc: reword VFIO and UIO Linux GSG section
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-11-19 9:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-19 9:49 [dpdk-test-report] |FAILURE| pw(84329) [v2, 4/4] doc: add VFIO troubleshooting section sys_stv
-- strict thread matches above, loose matches on Subject: below --
2020-11-18 15:41 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).