Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/72836 _apply issues_ Submitter: Ivan Dyukov Date: 2020-07-02 13:21:28 Reply_mail: 20200702132139.28078-2-i.dyukov@samsung.com DPDK git baseline: Repo:dpdk, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc * Repo: dpdk Auto-merging lib/librte_ethdev/rte_ethdev.h CONFLICT (content): Merge conflict in lib/librte_ethdev/rte_ethdev.h error: Failed to merge in the changes. Patch failed at 0001 ethdev: allow unknown link speed 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