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

_apply issues_

Submitter: Luca Boccassi <luca.boccassi@gmail.com>
Date: 2020-10-28 18:15:57
Reply_mail: 20201028181557.3662981-1-luca.boccassi@gmail.com

DPDK git baseline:
	Repo:dpdk, CommitID: c3afd1cba69bd7a900fd63c02cc87fba8d74430a


* Repo: dpdk
A	linux/igb_uio/Kbuild
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): linux/igb_uio/Kbuild deleted in HEAD and modified in igb_uio: include MODULE_CFLAGS in Kbuild. Version igb_uio: include MODULE_CFLAGS in Kbuild of linux/igb_uio/Kbuild left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 igb_uio: include MODULE_CFLAGS in Kbuild
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