Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/78882

_apply issues_

Submitter: Wenzhuo Lu <wenzhuo.lu@intel.com>
Date: 2020-09-27 01:30:26
Reply_mail: 1601170226-35444-4-git-send-email-wenzhuo.lu@intel.com

DPDK git baseline:
	Repo:dpdk-next-net-intel, CommitID: fc396e3ff5546c326212dea5625d7f1eb5fadd4b
	Repo:dpdk, CommitID: f5d6738c2ec10170b0e03eb9ff95544be0559641


* Repo: dpdk-next-net-intel
Auto-merging drivers/net/iavf/iavf_ethdev.c
Auto-merging doc/guides/rel_notes/release_20_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_11.rst
error: Failed to merge in the changes.
Patch failed at 0003 net/iavf: enable AVX512 for TX
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 drivers/net/iavf/iavf_ethdev.c
Auto-merging doc/guides/rel_notes/release_20_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_11.rst
error: Failed to merge in the changes.
Patch failed at 0003 net/iavf: enable AVX512 for TX
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