✗ Fi.CI.BUILD: failure for series starting with [01/49] drm/i915/gt: Call stop_ring() from ring resume, again

[Patchwork]

== Series Details ==

Series: series starting with [01/49] drm/i915/gt: Call stop_ring() from ring resume, again
URL   : https://patchwork.freedesktop.org/series/86104/
State : failure

== Summary ==

Applying: drm/i915/gt: Call stop_ring() from ring resume, again
Applying: drm/i915/gt: Do not suspend bonded requests if one hangs
Applying: drm/i915/gt: Skip over completed active execlists, again
Applying: drm/i915: Strip out internal priorities
Applying: drm/i915: Remove I915_USER_PRIORITY_SHIFT
Applying: drm/i915: Replace engine->schedule() with a known request operation
Applying: drm/i915: Teach the i915_dependency to use a double-lock
Applying: drm/i915: Restructure priority inheritance
Applying: drm/i915/selftests: Measure set-priority duration
Applying: drm/i915/selftests: Exercise priority inheritance around an engine loop
Applying: drm/i915: Improve DFS for priority inheritance
Applying: drm/i915/selftests: Exercise relative mmio paths to non-privileged registers
Applying: drm/i915/selftests: Exercise cross-process context isolation
Applying: drm/i915: Extract request submission from execlists
Applying: drm/i915: Extract request rewinding from execlists
Applying: drm/i915: Extract request suspension from the execlists
Applying: drm/i915: Extract the ability to defer and rerun a request later
Applying: drm/i915: Fix the iterative dfs for defering requests
Applying: drm/i915: Move common active lists from engine to i915_scheduler
Applying: drm/i915: Move scheduler queue
Applying: drm/i915: Move tasklet from execlists to sched
Applying: drm/i915/gt: Show scheduler queues when dumping state
Applying: drm/i915: Replace priolist rbtree with a skiplist
Applying: drm/i915: Wrap cmpxchg64 with try_cmpxchg64() helper
Applying: drm/i915: Fair low-latency scheduling
Applying: drm/i915/gt: Specify a deadline for the heartbeat
Applying: drm/i915: Extend the priority boosting for the display with a deadline
Applying: drm/i915/gt: Support virtual engine queues
Applying: drm/i915: Move saturated workload detection back to the context
Applying: drm/i915: Bump default timeslicing quantum to 5ms
Applying: drm/i915/gt: Wrap intel_timeline.has_initial_breadcrumb
Applying: drm/i915/gt: Track timeline GGTT offset separately from subpage offset
Applying: drm/i915/gt: Add timeline "mode"
Applying: drm/i915/gt: Use indices for writing into relative timelines
Applying: drm/i915/selftests: Exercise relative timeline modes
Applying: drm/i915/gt: Use ppHWSP for unshared non-semaphore related timelines
Applying: Restore "drm/i915: drop engine_pin/unpin_breadcrumbs_irq"
Applying: drm/i915/gt: Couple tasklet scheduling for all CS interrupts
Applying: drm/i915/gt: Support creation of 'internal' rings
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/intel_ring.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/intel_ring.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_ring.c
Patch failed at 0039 drm/i915/gt: Support creation of 'internal' rings
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".