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

_apply issues_

Submitter: Bruce Richardson <bruce.richardson@intel.com>
Date: 2020-10-15 15:05:54
Reply_mail: 20201015150554.950838-9-bruce.richardson@intel.com

DPDK git baseline:
	Repo:dpdk, CommitID: 4669252e0421aaf06ff86d5339f970ebe72cbf22


* Repo: dpdk
CONFLICT (content): Merge conflict in app/test-pmd/meson.build
Auto-merging app/test-crypto-perf/meson.build
CONFLICT (content): Merge conflict in app/test-crypto-perf/meson.build
error: Failed to merge in the changes.
Patch failed at 0001 app: fix missing dependencies
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