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

_apply issues_

Submitter: Chengchang Tang <tangchengchang@huawei.com>
Date: 2020-08-26 01:57:14
Reply_mail: 1598407034-19061-4-git-send-email-tangchengchang@huawei.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: 14c8e679ee5650d5f3a0c0a1c86f3d6e2691ba29
	Repo:dpdk, CommitID: b9b10ddb4292f2bc5524ae9f427a2795514eff02


* Repo: dpdk-next-net
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/hns3/hns3_rxtx.c
CONFLICT (content): Merge conflict in drivers/net/hns3/hns3_rxtx.c
error: Failed to merge in the changes.
Patch failed at 0003 net/hns3: add RX buffer size to rx qinfo querry
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
Applying: net/hns3: add RX buffer size to rx qinfo querry
error: sha1 information is lacking or useless (drivers/net/hns3/hns3_rxtx.c).
error: could not build fake ancestor
Patch failed at 0003 net/hns3: add RX buffer size to rx qinfo querry
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