Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/73137 _apply issues_ Submitter: Fady Bader Date: 2020-07-05 13:47:44 Reply_mail: 20200705134746.26240-2-fady@mellanox.com DPDK git baseline: Repo:dpdk, CommitID: f6d7f405760610e9c61994c846fe59b3516591aa * Repo: dpdk Auto-merging lib/meson.build CONFLICT (content): Merge conflict in lib/meson.build error: Failed to merge in the changes. Patch failed at 0001 eal: disable function versioning on 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