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

_apply issues_

Submitter: Stephen Hemminger <stephen@networkplumber.org>
Date: 2020-07-02 17:28:52
Reply_mail: 20200702172852.6201-1-stephen@networkplumber.org

DPDK git baseline:
	Repo:dpdk, CommitID: 0fc601af3a722ca3ed8bc7cba4c01e377513cdb3


* Repo: dpdk
Auto-merging config/meson.build
CONFLICT (content): Merge conflict in config/meson.build
error: Failed to merge in the changes.
Patch failed at 0001 metrics: make number of metrics names configurable
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