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

_apply issues_

Submitter: Fan Zhang <roy.fan.zhang@intel.com>
Date: 2020-07-03 10:14:10
Reply_mail: 20200703101411.23091-3-roy.fan.zhang@intel.com

DPDK git baseline:
	Repo:dpdk-next-crypto, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc
	Repo:dpdk, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc


* Repo: dpdk-next-crypto
CONFLICT (modify/delete): doc/guides/rel_notes/release_20_08.rst deleted in HEAD and modified in doc: add cryptodev direct APIs guide. Version doc: add cryptodev direct APIs guide of doc/guides/rel_notes/release_20_08.rst left in tree.
Auto-merging doc/guides/prog_guide/cryptodev_lib.rst
error: Failed to merge in the changes.
Patch failed at 0003 doc: add cryptodev direct APIs guide
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
CONFLICT (modify/delete): doc/guides/rel_notes/release_20_08.rst deleted in HEAD and modified in doc: add cryptodev direct APIs guide. Version doc: add cryptodev direct APIs guide of doc/guides/rel_notes/release_20_08.rst left in tree.
Auto-merging doc/guides/prog_guide/cryptodev_lib.rst
error: Failed to merge in the changes.
Patch failed at 0003 doc: add cryptodev direct APIs guide
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