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

_apply issues_

Submitter: Chenbo Xia <chenbo.xia@intel.com>
Date: 2021-01-14 06:25:12
Reply_mail: 20210114062512.45462-9-chenbo.xia@intel.com

DPDK git baseline:
	Repo:dpdk, CommitID: 6e4d4a6381c47cfe6d75225945b3f6a5f8453214


* Repo: dpdk
Auto-merging lib/meson.build
CONFLICT (content): Merge conflict in lib/meson.build
Auto-merging MAINTAINERS
error: Failed to merge in the changes.
Patch failed at 0001 lib: introduce emudev library
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