[Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [CI,1/3] drm/i915/gt: Move move context layout registers and offsets to lrc_reg.h

[Patchwork]

== Series Details ==

Series: series starting with [CI,1/3] drm/i915/gt: Move move context layout registers and offsets to lrc_reg.h
URL   : https://patchwork.freedesktop.org/series/84750/
State : failure

== Summary ==

Applying: drm/i915/gt: Move move context layout registers and offsets to lrc_reg.h
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_gt_irq.c
A	drivers/gpu/drm/i915/gt/intel_lrc.h
M	drivers/gpu/drm/i915/gt/intel_lrc_reg.h
M	drivers/gpu/drm/i915/gvt/mmio_context.h
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): drivers/gpu/drm/i915/gt/intel_lrc.h deleted in HEAD and modified in drm/i915/gt: Move move context layout registers and offsets to lrc_reg.h. Version drm/i915/gt: Move move context layout registers and offsets to lrc_reg.h of drivers/gpu/drm/i915/gt/intel_lrc.h left in tree.
Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/gt: Move move context layout registers and offsets to lrc_reg.h
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".