Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/74349 _apply issues_ Submitter: Ori Kam Date: 2020-07-17 11:10:59 Reply_mail: 1594984263-89741-10-git-send-email-orika@mellanox.com DPDK git baseline: Repo:dpdk-next-net-mlx, CommitID: 317add350320a629fe4a7d822b2dfbd732644ad8 Repo:dpdk, CommitID: f1602b4a86e8c0622326fad4f12a23e6ae0d435c * Repo: dpdk-next-net-mlx CONFLICT (content): Merge conflict in drivers/common/mlx5/mlx5_devx_cmds.h Auto-merging drivers/common/mlx5/mlx5_devx_cmds.c CONFLICT (content): Merge conflict in drivers/common/mlx5/mlx5_devx_cmds.c error: Failed to merge in the changes. Patch failed at 0003 regex/mlx5: add probe function 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: regex/mlx5: add completion queue creation error: corrupt patch at line 233 error: could not build fake ancestor Patch failed at 0008 regex/mlx5: add completion queue creation 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