[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with drm/i915/guc: Use a local cancel_port_requests (rev2)

[Patchwork]

== Series Details ==

Series: series starting with drm/i915/guc: Use a local cancel_port_requests (rev2)
URL   : https://patchwork.freedesktop.org/series/65089/
State : failure

== Summary ==

Applying: drm/i915/guc: Use a local cancel_port_requests
Applying: drm/i915: Push the wakeref->count deferral to the backend
Applying: drm/i915/gt: Save/restore interrupts around breadcrumb disable
Applying: drm/i915/execlists: Lift process_csb() out of the irq-off spinlock
Applying: drm/i915/gt: Track timeline activeness in enter/exit
Applying: drm/i915/gt: Convert timeline tracking to spinlock
Applying: drm/i915/gt: Guard timeline pinning with its own mutex
Applying: drm/i915: Protect request retirement with timeline->mutex
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/intel_gt.c
M	drivers/gpu/drm/i915/gt/intel_gt_types.h
M	drivers/gpu/drm/i915/gt/intel_ringbuffer.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/intel_ringbuffer.c
Auto-merging drivers/gpu/drm/i915/gt/intel_gt_types.h
Auto-merging drivers/gpu/drm/i915/gt/intel_gt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_gt.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0008 drm/i915: Protect request retirement with timeline->mutex
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".