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

_apply issues_

Submitter: Stephen Hemminger <stephen@networkplumber.org>
Date: 2020-10-22 20:40:02
Reply_mail: 20201022204002.30876-6-stephen@networkplumber.org

DPDK git baseline:
	Repo:dpdk, CommitID: 50ee0c2d0a8b1ad889de589228be9c2c7a056a76


* Repo: dpdk
CONFLICT (content): Merge conflict in doc/guides/cryptodevs/qat.rst
Auto-merging doc/guides/cryptodevs/dpaa_sec.rst
Auto-merging doc/guides/cryptodevs/dpaa2_sec.rst
error: Failed to merge in the changes.
Patch failed at 0005 doc: change references to blacklist and whitelist
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