Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/79844 _apply issues_ Submitter: Tal Shnaiderman Date: 2020-10-07 07:19:57 Reply_mail: 20201007071957.12020-1-talshn@nvidia.com DPDK git baseline: Repo:dpdk, CommitID: f459f6038283a1ad3b0f4d98edcedae70043428f * Repo: dpdk Falling back to patching base and 3-way merge... Auto-merging lib/librte_eal/rte_eal_exports.def CONFLICT (content): Merge conflict in lib/librte_eal/rte_eal_exports.def error: Failed to merge in the changes. Patch failed at 0001 eal/windows: export all built functions for clang 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