✗ Fi.CI.BAT: failure for series starting with [01/17] drm/i915/guc: Replace preempt_client lookup with engine->preempt_context

Patchwork patchwork at emeril.freedesktop.org
Mon Mar 25 00:28:20 UTC 2019


== Series Details ==

Series: series starting with [01/17] drm/i915/guc: Replace preempt_client lookup with engine->preempt_context
URL   : https://patchwork.freedesktop.org/series/58448/
State : failure

== Summary ==

Applying: drm/i915/guc: Replace preempt_client lookup with engine->preempt_context
Applying: drm/i915: Pull the GEM powermangement coupling into its own file
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_gem.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_gem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
Patch failed at 0002 drm/i915: Pull the GEM powermangement coupling into its own file
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