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

_apply issues_

Submitter: Jakub Grajciar <jgrajcia@cisco.com>
Date: 2020-10-12 08:28:29
Reply_mail: 20201012082829.5965-1-jgrajcia@cisco.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: 0846d0756efbe881d207c95555ac702ca9bbdd32
	Repo:dpdk, CommitID: e9b9739264063bb856965070cb9ca7726d2c4238


* Repo: dpdk-next-net
for removal and will be cleaned up.
    
    However failsafe_dev_remove() only remove active devices. Devices that
    failed during probe will be stuck in DEV_PARSED state repeatedly.
    
    Consider all devices when doing a removal round, but limit burst control
    and stats saving to active devices.
--
Falling back to patching base and 3-way merge...
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 0001 net/memif: use abstract socket address
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
Falling back to patching base and 3-way merge...
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 0001 net/memif: use abstract socket address
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