✗ Fi.CI.BUILD: failure for series starting with [01/12] drm/i915/gt: Schedule request retirement when signaler idles

[Patchwork]

== Series Details ==

Series: series starting with [01/12] drm/i915/gt: Schedule request retirement when signaler idles
URL   : https://patchwork.freedesktop.org/series/71170/
State : failure

== Summary ==

Applying: drm/i915/gt: Schedule request retirement when signaler idles
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
M	drivers/gpu/drm/i915/gt/intel_gt_requests.c
M	drivers/gpu/drm/i915/gt/intel_lrc.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915/gt: Track engine round-trip times
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/intel_engine_cs.c
M	drivers/gpu/drm/i915/gt/intel_engine_pm.c
M	drivers/gpu/drm/i915/gt/intel_engine_types.h
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_engine_types.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_engine_types.h
Auto-merging drivers/gpu/drm/i915/gt/intel_engine_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_engine_pm.c
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 0002 drm/i915/gt: Track engine round-trip times
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".