[Intel-gfx] ✗ Fi.CI.BUILD: failure for Fix I915_GVT dependency (rev2)
Patchwork
patchwork at emeril.freedesktop.org
Thu May 13 09:20:14 UTC 2021
== Series Details ==
Series: Fix I915_GVT dependency (rev2)
URL : https://patchwork.freedesktop.org/series/89996/
State : failure
== Summary ==
Applying: drm/i915/gvt: Move mdev attribute groups into kvmgt module
Applying: Revert "vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEV"
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/Kconfig
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/Kconfig
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Kconfig
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Revert "vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEV"
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