[Intel-gfx] ✗ Fi.CI.BUILD: failure for Introduce Intel PXP component (rev2)

[Patchwork]

== Series Details ==

Series: Introduce Intel PXP component (rev2)
URL   : https://patchwork.freedesktop.org/series/84136/
State : failure

== Summary ==

Applying: drm/i915/pxp: Introduce Intel PXP component
Applying: drm/i915/pxp: Enable PXP irq worker and callback stub
Applying: drm/i915/pxp: Add PXP context for logical hardware states.
Applying: drm/i915/pxp: set KCR reg init during the boot time
Applying: drm/i915/pxp: Implement ioctl action to set the user space context
Applying: drm/i915/pxp: Add PXP-related registers into allowlist
Applying: drm/i915/pxp: Read register to check hardware session state
Applying: drm/i915/pxp: Implement funcs to get/set PXP tag
Applying: drm/i915/pxp: Implement ioctl action to reserve session slot
Applying: drm/i915/pxp: Implement ioctl action to set session in play
Applying: drm/i915/pxp: Func to send hardware session termination
Applying: drm/i915/pxp: Implement ioctl action to terminate the session
Applying: drm/i915/pxp: Enable ioctl action to query PXP tag
Applying: drm/i915/pxp: Destroy all type0 sessions upon teardown
Applying: drm/i915/pxp: Termiante the session upon app crash
Applying: drm/i915/pxp: Enable PXP power management
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0016 drm/i915/pxp: Enable PXP power management
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".