automatic DPDK test reports
 help / color / mirror / Atom feed
From: sys_stv@intel.com
To: test-report@dpdk.org
Subject: [dpdk-test-report]  |FAILURE| pw(80340) [v4, 1/1] doc: document vfio-pci usage with QAT PMD
Date: 12 Oct 2020 03:54:00 -0700	[thread overview]
Message-ID: <569c58$fpbksa@orsmga005-auth.jf.intel.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 1485 bytes --]


Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/80340

_apply issues_

Submitter: Adam Dybkowski <adamx.dybkowski@intel.com>
Date: 2020-10-12 10:43:52
Reply_mail: 20201012104352.19236-2-adamx.dybkowski@intel.com

DPDK git baseline:
	Repo:dpdk-next-crypto, CommitID: 716913beb875b975e7f36912ab9504d4bbbcfa87
	Repo:dpdk, CommitID: f4eb44f81d8c47d157523f893fbab9baeb38f9c1


* Repo: dpdk-next-crypto
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/cryptodevs/qat.rst
CONFLICT (content): Merge conflict in doc/guides/cryptodevs/qat.rst
error: Failed to merge in the changes.
Patch failed at 0001 doc: document vfio-pci usage with QAT PMD
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".

* Repo: dpdk
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/cryptodevs/qat.rst
CONFLICT (content): Merge conflict in doc/guides/cryptodevs/qat.rst
error: Failed to merge in the changes.
Patch failed at 0001 doc: document vfio-pci usage with QAT PMD
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

             reply	other threads:[~2020-10-12 10:54 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-12 10:54 sys_stv [this message]
2020-10-13  8:43 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='569c58$fpbksa@orsmga005-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).