[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: uAPI clean-ups part 2 (rev3)

[Patchwork]

== Series Details ==

Series: drm/i915: uAPI clean-ups part 2 (rev3)
URL   : https://patchwork.freedesktop.org/series/88196/
State : failure

== Summary ==

Applying: drm/i915: Drop I915_CONTEXT_PARAM_RINGSIZE
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/Makefile
M	drivers/gpu/drm/i915/gem/i915_gem_context.c
M	drivers/gpu/drm/i915/gt/intel_context_param.h
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): drivers/gpu/drm/i915/gt/intel_context_param.h deleted in drm/i915: Drop I915_CONTEXT_PARAM_RINGSIZE and modified in HEAD. Version HEAD of drivers/gpu/drm/i915/gt/intel_context_param.h left in tree.
Removing drivers/gpu/drm/i915/gt/intel_context_param.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c
Auto-merging drivers/gpu/drm/i915/Makefile
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: Drop I915_CONTEXT_PARAM_RINGSIZE
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".