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

_apply issues_

Submitter: Steve Yang <stevex.yang@intel.com>
Date: 2021-01-18 07:04:28
Reply_mail: 20210118070428.36998-23-stevex.yang@intel.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: 11fa6ef8189037a2408722462a1deb027a7d5c1b
	Repo:dpdk, CommitID: d559d2048e368400feb455fa2b082eee81d2f5cc


* Repo: dpdk-next-net
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/ixgbe/ixgbe_pf.c
CONFLICT (content): Merge conflict in drivers/net/ixgbe/ixgbe_pf.c
error: Failed to merge in the changes.
Patch failed at 0016 net/ixgbe: fix the jumbo frame flag condition
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 drivers/net/ixgbe/ixgbe_pf.c
CONFLICT (content): Merge conflict in drivers/net/ixgbe/ixgbe_pf.c
error: Failed to merge in the changes.
Patch failed at 0016 net/ixgbe: fix the jumbo frame flag condition
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