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

_apply issues_

Submitter: Juraj Linkeš <juraj.linkes@pantheon.tech>
Date: 2020-11-13 11:09:49
Reply_mail: 1605265789-12932-16-git-send-email-juraj.linkes@pantheon.tech

DPDK git baseline:
	Repo:dpdk, CommitID: 40892ddb3968ef7a5bb1318d177e8d7268313fff


* Repo: dpdk
Falling back to patching base and 3-way merge...
Auto-merging meson_options.txt
CONFLICT (content): Merge conflict in meson_options.txt
error: Failed to merge in the changes.
Patch failed at 0014 build: add Arm SoC meson option
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