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

_apply issues_

Submitter: Ray Kinsella <mdr@ashroe.eu>
Date: 2020-08-12 11:26:02
Reply_mail: 1597231565-5094-1-git-send-email-mdr@ashroe.eu

DPDK git baseline:
	Repo:dpdk, CommitID: b9b10ddb4292f2bc5524ae9f427a2795514eff02


* Repo: dpdk
CONFLICT (content): Merge conflict in doc/guides/contributing/abi_versioning.rst
Auto-merging doc/guides/contributing/abi_policy.rst
CONFLICT (content): Merge conflict in doc/guides/contributing/abi_policy.rst
error: Failed to merge in the changes.
Patch failed at 0001 doc: add section describing new abi versions
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