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

_apply issues_

Submitter: Ajit Khaparde <ajit.khaparde@broadcom.com>
Date: 2020-07-02 23:28:10
Reply_mail: 20200702232838.92817-24-ajit.khaparde@broadcom.com

DPDK git baseline:
	Repo:dpdk-next-net-brcm, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc
	Repo:dpdk, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc


* Repo: dpdk-next-net-brcm
CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt.h
Auto-merging drivers/net/bnxt/Makefile
error: Failed to merge in the changes.
Patch failed at 0001 net/bnxt: add basic infrastructure for VF reps
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
CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt.h
Auto-merging drivers/net/bnxt/Makefile
error: Failed to merge in the changes.
Patch failed at 0001 net/bnxt: add basic infrastructure for VF reps
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