From: sys_stv@intel.com
To: test-report@dpdk.org
Subject: [dpdk-test-report] |FAILURE| pw(84329) [v2, 4/4] doc: add VFIO troubleshooting section
Date: 18 Nov 2020 07:41:03 -0800 [thread overview]
Message-ID: <537a4c$e6afu5@orsmga004-auth.jf.intel.com> (raw)
[-- 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
next reply other threads:[~2020-11-18 15:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-18 15:41 sys_stv [this message]
2020-11-19 9:49 sys_stv
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='537a4c$e6afu5@orsmga004-auth.jf.intel.com' \
--to=sys_stv@intel.com \
--cc=test-report@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).