[dpdk-test-report] |FAILURE| pw(80340) [v4, 1/1] doc: document vfio-pci usage with QAT PMD

sys_stv at intel.com sys_stv at intel.com
Tue Oct 13 10:43:54 CEST 2020


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

_apply issues_

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

DPDK git baseline:
	Repo:dpdk-next-crypto, CommitID: fc0814ea7ab507467d001d2a3a7d2a3747701a78
	Repo:dpdk, CommitID: 7cf3d07c3adcb015c303e4cdf2ef9712a65ce46d


* 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


More information about the test-report mailing list