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

_apply issues_

Submitter: Juraj Linkeš <juraj.linkes@pantheon.tech>
Date: 2021-01-19 08:33:07
Reply_mail: 1611045187-8097-4-git-send-email-juraj.linkes@pantheon.tech

DPDK git baseline:
	Repo:dpdk, CommitID: dc8ac7980c5982e512c6723b3409fa69ed106f20


* Repo: dpdk
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
CONFLICT (content): Merge conflict in doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
error: Failed to merge in the changes.
Patch failed at 0003 doc: add clang to aarch64 cross build guide
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