Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/77925 _apply issues_ Submitter: Savinay Dharmappa Date: 2020-09-16 16:43:53 Reply_mail: 1600274633-371993-10-git-send-email-savinay.dharmappa@intel.com DPDK git baseline: Repo:dpdk-next-net, CommitID: 3f97b7bfd8958268bf9657f34f323aa9186e9f98 Repo:dpdk, CommitID: e41d27a68df6939bef97a4afa6ffc32eb8b2c2c1 * Repo: dpdk-next-net Auto-merging doc/guides/rel_notes/release_20_11.rst CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_11.rst Auto-merging doc/guides/rel_notes/deprecation.rst error: Failed to merge in the changes. Patch failed at 0009 sched: remove the redundant code 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 Auto-merging doc/guides/rel_notes/release_20_11.rst CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_11.rst Auto-merging doc/guides/rel_notes/deprecation.rst error: Failed to merge in the changes. Patch failed at 0009 sched: remove the redundant code 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