✗ Fi.CI.BAT: failure for series starting with [01/19] drm/i915: Keep engine alive as we retire the context

Patchwork patchwork at emeril.freedesktop.org
Mon Jun 17 20:55:11 UTC 2019


== Series Details ==

Series: series starting with [01/19] drm/i915: Keep engine alive as we retire the context
URL   : https://patchwork.freedesktop.org/series/62212/
State : failure

== Summary ==

Applying: drm/i915: Keep engine alive as we retire the context
Applying: drm/i915/gtt: Serialise both updates to PDE and our shadow
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_gem_gtt.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c
Patch failed at 0002 drm/i915/gtt: Serialise both updates to PDE and our shadow
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-trybot mailing list