Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/72969 _apply issues_ Submitter: Fan Zhang Date: 2020-07-03 10:14:10 Reply_mail: 20200703101411.23091-3-roy.fan.zhang@intel.com DPDK git baseline: Repo:dpdk, CommitID: 0fc601af3a722ca3ed8bc7cba4c01e377513cdb3 * 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 0003 doc: add cryptodev direct APIs guide 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