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

_apply issues_

Submitter: Thomas Monjalon <thomas@monjalon.net>
Date: 2020-11-03 12:22:05
Reply_mail: 20201103122205.183472-17-thomas@monjalon.net

DPDK git baseline:
	Repo:dpdk, CommitID: da02b0c304e9055bd3a31e1179679f87cdb9fd5b


* Repo: dpdk
CONFLICT (content): Merge conflict in lib/librte_mbuf/version.map
Auto-merging lib/librte_mbuf/rte_mbuf_dyn.c
CONFLICT (content): Merge conflict in lib/librte_mbuf/rte_mbuf_dyn.c
error: Failed to merge in the changes.
Patch failed at 0002 mbuf: add Rx timestamp flag and helpers
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