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

_apply issues_

Submitter: Fady Bader <fady@mellanox.com>
Date: 2020-08-11 06:24:24
Reply_mail: 20200811062424.14248-6-fady@mellanox.com

DPDK git baseline:
	Repo:dpdk, CommitID: cd6f1d7a5fde76c4f1e771de9f7aafdf59d691e4


* 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