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

_apply issues_

Submitter: Jiawen Wu <jiawenwu@trustnetic.com>
Date: 2020-10-27 06:24:06
Reply_mail: 20201027062406.243081-2-jiawenwu@trustnetic.com

DPDK git baseline:
	Repo:dpdk, CommitID: 5d7366372888ba654d3ba02b2b06de469ec433b9


* Repo: dpdk
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): drivers/net/txgbe/txgbe_pf.c deleted in HEAD and modified in net/txgbe: fix driver exit. Version net/txgbe: fix driver exit of drivers/net/txgbe/txgbe_pf.c left in tree.
CONFLICT (modify/delete): drivers/net/txgbe/txgbe_ethdev.h deleted in HEAD and modified in net/txgbe: fix driver exit. Version net/txgbe: fix driver exit of drivers/net/txgbe/txgbe_ethdev.h left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 net/txgbe: fix driver exit
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