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

_apply issues_

Submitter: Guoyang Zhou <zhouguoyang@huawei.com>
Date: 2020-11-20 03:40:40
Reply_mail: de81246d43808a9acfdc0c90c77c854364dae26a.1605842700.git.zhouguoyang@huawei.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: 07ce5315604a2e2510b94b348e6b77ef089118e1
	Repo:dpdk, CommitID: 61bd270c4adc7dff1f9c8af1f2c72618860d4395


* Repo: dpdk-next-net
This will be required in git-pw 2.0
Starting new HTTP connection (1): proxy-shz.intel.com
Starting new HTTP connection (1): proxy-shz.intel.com
Applying: net/hinic: fix the problem of hugepage memory leaks
Using index info to reconstruct a base tree...
M	drivers/net/hinic/base/hinic_pmd_nicio.c
M	drivers/net/hinic/hinic_pmd_ethdev.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/hinic/hinic_pmd_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/hinic/hinic_pmd_ethdev.c
error: Failed to merge in the changes.
Patch failed at 0001 net/hinic: fix the problem of hugepage memory leaks
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".

* Repo: dpdk
This will be required in git-pw 2.0
Starting new HTTP connection (1): proxy-shz.intel.com
Starting new HTTP connection (1): proxy-shz.intel.com
Applying: net/hinic: fix the problem of hugepage memory leaks
Using index info to reconstruct a base tree...
M	drivers/net/hinic/base/hinic_pmd_nicio.c
M	drivers/net/hinic/hinic_pmd_ethdev.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/hinic/hinic_pmd_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/hinic/hinic_pmd_ethdev.c
error: Failed to merge in the changes.
Patch failed at 0001 net/hinic: fix the problem of hugepage memory leaks
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