[dpdk-test-report] |FAILURE| pw(72885) [v4, 18/51] net/bnxt: multiple device implementation
sys_stv at intel.com
sys_stv at intel.com
Fri Jul 3 17:02:09 CEST 2020
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/72885
_apply issues_
Submitter: Ajit Khaparde <ajit.khaparde at broadcom.com>
Date: 2020-07-02 23:28:05
Reply_mail: 20200702232838.92817-19-ajit.khaparde at 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
More information about the test-report
mailing list