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

_apply issues_

Submitter: Timothy McDaniel <timothy.mcdaniel@intel.com>
Date: 2020-10-23 18:32:32
Reply_mail: 1603477952-583-24-git-send-email-timothy.mcdaniel@intel.com

DPDK git baseline:
	Repo:dpdk-next-eventdev, CommitID: 9c7d8eed1a45da868b4bedd542b9961da460006e
	Repo:dpdk, CommitID: 9c7d8eed1a45da868b4bedd542b9961da460006e


* Repo: dpdk-next-eventdev
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_20_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_11.rst
error: Failed to merge in the changes.
Patch failed at 0023 event/dlb: add timeout ticks entry point
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_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_11.rst
error: Failed to merge in the changes.
Patch failed at 0023 event/dlb: add timeout ticks entry point
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