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

_apply issues_

Submitter: Thomas Monjalon <thomas@monjalon.net>
Date: 2020-09-17 10:41:33
Reply_mail: 20200917104133.6186-5-thomas@monjalon.net

DPDK git baseline:
	Repo:dpdk, CommitID: c23432a9c287501071688fe5208078bc6ed371b4


* Repo: dpdk
trace: fix C++ compilation
    
    trace_mem is declared as 'void *' which triggers following error:
    '...invalid conversion from ‘void*’ to ‘__rte_trace_header*’
    [-fpermissive]...'
    
--
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 mem: remove physical address aliases
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