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

_apply issues_

Submitter: Fu, Patrick <patrick.fu@intel.com>
Date: 2020-07-22 10:57:41
Reply_mail: 20200722105741.3421255-3-patrick.fu@intel.com

DPDK git baseline:
	Repo:dpdk-next-virtio, CommitID: bf3f53e9b00cb17049f16a10d9a4e89f56e4b92b
	Repo:dpdk, CommitID: 3126c6e04118e92364571b7020f7bb1567bac694


* Repo: dpdk-next-virtio
Applying: doc: update release notes for vhost async APIs
error: sha1 information is lacking or useless (doc/guides/rel_notes/release_20_08.rst).
error: could not build fake ancestor
Patch failed at 0002 doc: update release notes for vhost async APIs
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/rel_notes/release_20_08.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_08.rst
error: Failed to merge in the changes.
Patch failed at 0002 doc: update release notes for vhost async APIs
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