✗ Fi.CI.BUILD: failure for series starting with [01/75] drm/i915/gt: Retire unexpected starting state error dumping

[Patchwork]

== Series Details ==

Series: series starting with [01/75] drm/i915/gt: Retire unexpected starting state error dumping
URL   : https://patchwork.freedesktop.org/series/86575/
State : failure

== Summary ==

Applying: drm/i915/gt: Retire unexpected starting state error dumping
Applying: drm/i915: Protect against request freeing during cancellation on wedging
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/intel_execlists_submission.c
M	drivers/gpu/drm/i915/gt/intel_reset.c
M	drivers/gpu/drm/i915/gt/intel_ring_submission.c
M	drivers/gpu/drm/i915/gt/mock_engine.c
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...
Auto-merging drivers/gpu/drm/i915/gt/intel_reset.c
No changes -- Patch already applied.
Applying: drm/i915: Take rcu_read_lock for querying fence's driver/timeline names
Applying: drm/i915/selftests: Use a single copy of the mocs table
Applying: drm/i915/gt: Always flush the submission queue on checking for idle
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/intel_engine_cs.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_engine_cs.c
Patch failed at 0005 drm/i915/gt: Always flush the submission queue on checking for idle
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".