[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: prepare for uC loading on MTL (rev6)

[Patchwork]

== Series Details ==

Series: drm/i915: prepare for uC loading on MTL (rev6)
URL   : https://patchwork.freedesktop.org/series/108925/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/108925/revisions/6/mbox/ not applied
Applying: drm/i915/huc: only load HuC on GTs that have VCS engines
Applying: drm/i915/uc: fetch uc firmwares for each GT
Applying: drm/i915/uc: use different ggtt pin offsets for uc loads
Applying: drm/i915/guc: Add GuC deprivilege feature to MTL
Applying: drm/i915/mtl: Handle wopcm per-GT and limit calculations.
Applying: drm/i915/guc: define media GT GuC send regs
Applying: drm/i915/guc: handle interrupts from media GuC
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/intel_gt_irq.c
M	drivers/gpu/drm/i915/gt/intel_gt_regs.h
M	drivers/gpu/drm/i915/gt/uc/intel_guc.c
M	drivers/gpu/drm/i915/gt/uc/intel_guc.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc.h
Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc.c
Auto-merging drivers/gpu/drm/i915/gt/intel_gt_regs.h
Auto-merging drivers/gpu/drm/i915/gt/intel_gt_irq.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_gt_irq.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0007 drm/i915/guc: handle interrupts from media GuC
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".