Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/73000 _apply issues_ Submitter: David Coyle Date: 2020-07-03 12:39:27 Reply_mail: 20200703123933.52351-2-david.coyle@intel.com DPDK git baseline: Repo:dpdk, CommitID: f6d7f405760610e9c61994c846fe59b3516591aa * Repo: dpdk Auto-merging doc/guides/rel_notes/release_20_08.rst CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_08.rst error: Failed to merge in the changes. Patch failed at 0001 security: add support for DOCSIS protocol 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