✗ Fi.CI.BAT: failure for series starting with [01/24] drm/i915: Keep rings pinned while the context is active

[Patchwork]

== Series Details ==

Series: series starting with [01/24] drm/i915: Keep rings pinned while the context is active
URL   : https://patchwork.freedesktop.org/series/62398/
State : failure

== Summary ==

Applying: drm/i915: Keep rings pinned while the context is active
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/intel_context.c
M	drivers/gpu/drm/i915/gt/intel_engine_types.h
M	drivers/gpu/drm/i915/gt/intel_lrc.c
M	drivers/gpu/drm/i915/gt/intel_ringbuffer.c
M	drivers/gpu/drm/i915/gt/mock_engine.c
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
Patch failed at 0001 drm/i915: Keep rings pinned while the context is active
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".