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

_apply issues_

Submitter: Arek Kusztal <arkadiuszx.kusztal@intel.com>
Date: 2020-07-07 15:02:38
Reply_mail: 20200707150239.13400-3-arkadiuszx.kusztal@intel.com

DPDK git baseline:
	Repo:dpdk-next-crypto, CommitID: 048db4b6dcccaee9277ce5b4fbb2fe684b212e22
	Repo:dpdk, CommitID: f6ac2b06ecffa62abbc2cd6009b593604c2f3447


* Repo: dpdk-next-crypto
CONFLICT (content): Merge conflict in drivers/common/qat/qat_device.h
Auto-merging doc/guides/rel_notes/release_20_08.rst
error: Failed to merge in the changes.
Patch failed at 0001 drivers/qat: improve handling of multi process
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
Applying: drivers/qat: improve handling of multi process
error: sha1 information is lacking or useless (doc/guides/rel_notes/release_20_08.rst).
error: could not build fake ancestor
Patch failed at 0001 drivers/qat: improve handling of multi process
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