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

_apply issues_

Submitter: Hariprasad Govindharajan <hariprasad.govindharajan@intel.com>
Date: 2020-10-29 19:16:57
Reply_mail: 1603999017-43206-1-git-send-email-hariprasad.govindharajan@intel.com

DPDK git baseline:
	Repo:dpdk, CommitID: 72935f5fd70692e93a8b2f4540b346f09a1bc9cc


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