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

_apply issues_

Submitter: Suanming Mou <suanmingm@nvidia.com>
Date: 2020-10-27 12:27:29
Reply_mail: 1603801650-442376-35-git-send-email-suanmingm@nvidia.com

DPDK git baseline:
	Repo:dpdk-next-net-mlx, CommitID: 9c994d9720f27a4860b1c84d2e16b6c7f276ccdd
	Repo:dpdk, CommitID: c3afd1cba69bd7a900fd63c02cc87fba8d74430a


* Repo: dpdk-next-net-mlx
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/mlx5/mlx5_flow_verbs.c
CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_flow_verbs.c
error: Failed to merge in the changes.
Patch failed at 0002 net/mlx5: use thread specific flow workspace
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/mlx5: use thread specific flow workspace
error: sha1 information is lacking or useless (drivers/net/mlx5/linux/mlx5_os.c).
error: could not build fake ancestor
Patch failed at 0002 net/mlx5: use thread specific flow workspace
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