Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/84329 _apply issues_ Submitter: Anatoly Burakov Date: 2020-11-18 15:37:38 Reply_mail: d3941b43dcc1862f097515a4b727198fd45c2bc1.1605713845.git.anatoly.burakov@intel.com DPDK git baseline: Repo:dpdk, CommitID: 2069f9eefca06190377bbff14734e2326439df42 * Repo: dpdk Falling back to patching base and 3-way merge... Auto-merging doc/guides/linux_gsg/linux_drivers.rst CONFLICT (content): Merge conflict in doc/guides/linux_gsg/linux_drivers.rst error: Failed to merge in the changes. Patch failed at 0002 doc: reword VFIO and UIO Linux GSG section 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