Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/73774 _apply issues_ Submitter: Hemant Agrawal Date: 2020-07-10 17:19:41 Reply_mail: 20200710171946.23246-4-hemant.agrawal@nxp.com DPDK git baseline: Repo:dpdk-next-net, CommitID: 761f4e4bb23e07e9e54c4e8e67bfd2c0c2bc1597 Repo:dpdk, CommitID: 0b459fa02a8d9e721ca6909f7183b9826b14bbda * Repo: dpdk-next-net Auto-merging drivers/net/dpaa/dpaa_ethdev.c CONFLICT (content): Merge conflict in drivers/net/dpaa/dpaa_ethdev.c error: Failed to merge in the changes. Patch failed at 0001 net/dpaa: support Rxq and Txq info routines 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/dpaa: support Rxq and Txq info routines error: sha1 information is lacking or useless (drivers/bus/dpaa/include/fsl_qman.h). error: could not build fake ancestor Patch failed at 0001 net/dpaa: support Rxq and Txq info routines 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