✗ Ro.CI.BAT: failure for series starting with [01/55] drm/i915: Reduce breadcrumb lock coverage for intel_engine_enable_signaling() (rev2)

Patchwork
2016-07-26T10:48:52Z

== Series Details ==

Series: series starting with [01/55] drm/i915: Reduce breadcrumb lock coverage for intel_engine_enable_signaling() (rev2)
URL : https://patchwork.freedesktop.org/series/10246/
State : failure

== Summary ==

Applying: drm/i915: Reduce breadcrumb lock coverage for intel_engine_enable_signaling()
Applying: drm/i915: Prefer list_first_entry_or_null
Applying: drm/i915: Only clear the client pointer when tearing down the file
Applying: drm/i915: Only drop the batch-pool's object reference
Applying: drm/i915/cmdparser: Remove stray intel_engine_cs *ring
Applying: drm/i915: Use engine to refer to the user's BSD intel_engine_cs
Applying: drm/i915: Avoid using intel_engine_cs *ring for GPU error capture
Applying: drm/i915: Remove stray intel_engine_cs ring identifiers from i915_gem.c
Applying: drm/i915: Update a couple of hangcheck comments to talk about engines
Applying: drm/i915: Unify intel_logical_ring_emit and intel_ring_emit
Applying: drm/i915: Rename request->ringbuf to request->ring
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_gpu_error.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gpu_error.c
error: Failed to merge in the changes.
Patch failed at 0011 drm/i915: Rename request->ringbuf to request->ring
The copy of the patch that failed is found in: .git/rebase-apply/patch
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".