✗ Fi.CI.BAT: failure for series starting with [01/11] drm/i915: Store the default sseu setup on the engine

Patchwork patchwork at emeril.freedesktop.org
Fri Apr 5 20:14:16 UTC 2019


== Series Details ==

Series: series starting with [01/11] drm/i915: Store the default sseu setup on the engine
URL   : https://patchwork.freedesktop.org/series/59038/
State : failure

== Summary ==

Applying: drm/i915: Store the default sseu setup on the engine
Applying: drm/i915: Move GraphicsTechnology files under gt/
Applying: drm/i915: Use lockdep_pin_lock() over the construction of the request
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_request.c
M	drivers/gpu/drm/i915/i915_request.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915/execlists: Enable coarse preemption boundaries for gen8
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/intel_lrc.c
M	drivers/gpu/drm/i915/gt/selftest_lrc.c
M	drivers/gpu/drm/i915/i915_gem_context.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_gem_context.c
Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c
Patch failed at 0004 drm/i915/execlists: Enable coarse preemption boundaries for gen8
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