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

_apply issues_

Submitter: Bruce Richardson <bruce.richardson@intel.com>
Date: 2021-01-14 11:06:06
Reply_mail: 20210114110606.21142-21-bruce.richardson@intel.com

DPDK git baseline:
	Repo:dpdk, CommitID: 6e4d4a6381c47cfe6d75225945b3f6a5f8453214


* Repo: dpdk
Falling back to patching base and 3-way merge...
Auto-merging lib/librte_mbuf/rte_mbuf_dyn.h
CONFLICT (content): Merge conflict in lib/librte_mbuf/rte_mbuf_dyn.h
error: Failed to merge in the changes.
Patch failed at 0006 mbuf: fix missing header include
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