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

_apply issues_

Submitter: Fady Bader <fady@mellanox.com>
Date: 2020-08-04 06:29:47
Reply_mail: 20200804062947.6176-6-fady@mellanox.com

DPDK git baseline:
	Repo:dpdk, CommitID: 6636b04b82897816e0e05134f55a578cb7e124bc


* Repo: dpdk
Falling back to patching base and 3-way merge...
Auto-merging lib/meson.build
CONFLICT (content): Merge conflict in lib/meson.build
error: Failed to merge in the changes.
Patch failed at 0005 ethdev: compiling ethdev under Windows
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