[Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [v7,1/3] i915/gvt: Separate the MMIO tracking table from GVT-g (rev2)

Patchwork patchwork at emeril.freedesktop.org
Thu Mar 31 07:46:56 UTC 2022


== Series Details ==

Series: series starting with [v7,1/3] i915/gvt: Separate the MMIO tracking table from GVT-g (rev2)
URL   : https://patchwork.freedesktop.org/series/101803/
State : failure

== Summary ==

Applying: i915/gvt: Separate the MMIO tracking table from GVT-g
Using index info to reconstruct a base tree...
A	drivers/gpu/drm/i915/intel_gvt_mmio_table.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): drivers/gpu/drm/i915/intel_gvt_mmio_table.c deleted in HEAD and modified in i915/gvt: Separate the MMIO tracking table from GVT-g. Version i915/gvt: Separate the MMIO tracking table from GVT-g of drivers/gpu/drm/i915/intel_gvt_mmio_table.c left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 i915/gvt: Separate the MMIO tracking table from GVT-g
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".




More information about the Intel-gfx mailing list