Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/75078 _apply issues_ Submitter: McDaniel, Timothy Date: 2020-07-30 19:50:13 Reply_mail: 1596138614-17409-27-git-send-email-timothy.mcdaniel@intel.com DPDK git baseline: Repo:dpdk, CommitID: 544f35c334e5c0b99b4d2f93ca6d38fb7e1299d6 * Repo: dpdk Auto-merging drivers/event/dpaa2/dpaa2_eventdev.c CONFLICT (content): Merge conflict in drivers/event/dpaa2/dpaa2_eventdev.c Auto-merging drivers/event/dpaa/dpaa_eventdev.c error: Failed to merge in the changes. Patch failed at 0001 eventdev: dlb upstream prerequisites 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