Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/75081 _apply issues_ Submitter: Dmitry Kozlyuk Date: 2020-07-30 21:06:46 Reply_mail: 20200730210652.14568-3-dmitry.kozliuk@gmail.com DPDK git baseline: Repo:dpdk, CommitID: 544f35c334e5c0b99b4d2f93ca6d38fb7e1299d6 * Repo: dpdk A lib/librte_eal/windows/include/netinet/in.h Falling back to patching base and 3-way merge... CONFLICT (modify/delete): lib/librte_eal/windows/include/netinet/in.h deleted in HEAD and modified in eal/windows: improve compatibility networking headers. Version eal/windows: improve compatibility networking headers of lib/librte_eal/windows/include/netinet/in.h left in tree. error: Failed to merge in the changes. Patch failed at 0005 eal/windows: improve compatibility networking headers 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