[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission (rev2)

[Patchwork]

== Series Details ==

Series: drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission (rev2)
URL   : https://patchwork.freedesktop.org/series/68685/
State : failure

== Summary ==

Applying: drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission
Using index info to reconstruct a base tree...
A	drivers/gpu/drm/i915/intel_uc.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): drivers/gpu/drm/i915/intel_uc.c deleted in HEAD and modified in drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission. Version drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission of drivers/gpu/drm/i915/intel_uc.c left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 drm/i915/guc: Skip suspend/resume GuC action on platforms w/o GuC submission
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".