[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/gvt: Add missing symbol export.

Patchwork patchwork at emeril.freedesktop.org
Mon Apr 25 22:14:18 UTC 2022


== Series Details ==

Series: drm/i915/gvt: Add missing symbol export.
URL   : https://patchwork.freedesktop.org/series/103101/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/103101/revisions/1/mbox/ not applied
Applying: drm/i915/gvt: Add missing symbol export.
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/intel_gvt.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_gvt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_gvt.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/gvt: Add missing symbol export.
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