[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [01/10] drm/i915: Seal races between async GPU cancellation, retirement and signaling (rev2)
Patchwork
patchwork at emeril.freedesktop.org
Fri Apr 26 06:12:05 UTC 2019
== Series Details ==
Series: series starting with [01/10] drm/i915: Seal races between async GPU cancellation, retirement and signaling (rev2)
URL : https://patchwork.freedesktop.org/series/59912/
State : failure
== Summary ==
Applying: drm/i915: Seal races between async GPU cancellation, retirement and signaling
Applying: drm/i915/gvt: Pin the per-engine GVT shadow contexts
Applying: drm/i915: Export intel_context_instance()
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gvt/scheduler.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/scheduler.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0003 drm/i915: Export intel_context_instance()
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