Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/81688 _apply issues_ Submitter: Ciara Power Date: 2020-10-21 08:17:24 Reply_mail: 20201021081725.68541-15-ciara.power@intel.com DPDK git baseline: Repo:dpdk, CommitID: 4669252e0421aaf06ff86d5339f970ebe72cbf22 * Repo: dpdk Auto-merging doc/guides/nics/memif.rst CONFLICT (content): Merge conflict in doc/guides/nics/memif.rst Auto-merging doc/guides/nics/bnxt.rst error: Failed to merge in the changes. Patch failed at 0003 doc: remove references to make from NICs guides 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