* [dpdk-test-report] |FAILURE| pw(80548) [v4] pci/linux: copy new id for inserted device
@ 2020-10-14 5:48 sys_stv
0 siblings, 0 replies; only message in thread
From: sys_stv @ 2020-10-14 5:48 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 858 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/80548
_apply issues_
Submitter: Jim Harris <james.r.harris@intel.com>
Date: 2020-10-13 14:06:54
Reply_mail: 20201013140654.37415-1-james.r.harris@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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-10-14 5:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-14 5:48 [dpdk-test-report] |FAILURE| pw(80548) [v4] pci/linux: copy new id for inserted device sys_stv
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).