[dpdk-test-report] |FAILURE| pw(80410) [v3] pci/linux: copy new id for inserted device
sys_stv at intel.com
sys_stv at intel.com
Wed Oct 14 00:34:02 CEST 2020
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/80410
_apply issues_
Submitter: Jim Harris <james.r.harris at intel.com>
Date: 2020-10-12 22:01:36
Reply_mail: 20201012220136.6618-1-james.r.harris at intel.com
DPDK git baseline:
Repo:dpdk, CommitID: 9d3ad80abd34f2420998d94606e208518d330bcc
* Repo: dpdk
Falling back to patching base and 3-way merge...
Auto-merging drivers/bus/pci/linux/pci.c
CONFLICT (content): Merge conflict in drivers/bus/pci/linux/pci.c
error: Failed to merge in the changes.
Patch failed at 0001 pci/linux: copy new id for inserted device
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