Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/84401

_apply issues_

Submitter: Yongxin Liu <yongxin.liu@windriver.com>
Date: 2020-11-20 02:22:33
Reply_mail: 20201120022233.25498-1-yongxin.liu@windriver.com

DPDK git baseline:
	Repo:dpdk, CommitID: 61bd270c4adc7dff1f9c8af1f2c72618860d4395


* Repo: dpdk
Falling back to patching base and 3-way merge...
Auto-merging usertools/dpdk-devbind.py
CONFLICT (content): Merge conflict in usertools/dpdk-devbind.py
error: Failed to merge in the changes.
Patch failed at 0001 usertools/devbind: fix binding for built-in kernel drivers
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