[Intel-gfx] ✗ Fi.CI.BUILD: failure for Introduce Intel PXP component - Mesa single session (rev22)

[Patchwork]

== Series Details ==

Series: Introduce Intel PXP component - Mesa single session (rev22)
URL   : https://patchwork.freedesktop.org/series/84620/
State : failure

== Summary ==

Applying: drm/i915/pxp: Add plane decryption support
Applying: drm/i915/pxp: set KCR reg init during the boot time
Using index info to reconstruct a base tree...
A	drivers/gpu/drm/i915/pxp/intel_pxp.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): drivers/gpu/drm/i915/pxp/intel_pxp.c deleted in HEAD and modified in drm/i915/pxp: set KCR reg init during the boot time. Version drm/i915/pxp: set KCR reg init during the boot time of drivers/gpu/drm/i915/pxp/intel_pxp.c left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 drm/i915/pxp: set KCR reg init during the boot time
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".