== Series Details == Series: drm/i915/mtl: Add C10 and C20 phy support (rev7) URL : https://patchwork.freedesktop.org/series/109714/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/109714/revisions/7/mbox/ not applied Applying: drm/i915/mtl: Initial DDI port setup Applying: drm/i915/mtl: Add DP rates Applying: drm/i915/mtl: Create separate reg file for PICA registers Applying: drm/i915/mtl: Add Support for C10 PHY message bus and pll programming Applying: drm/i915/mtl: Add C10 phy programming for HDMI Applying: drm/i915/mtl: Add vswing programming for C10 phys Applying: drm/i915/mtl: Add support for PM DEMAND Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_display.c M drivers/gpu/drm/i915/display/intel_display_power.c M drivers/gpu/drm/i915/i915_irq.c M drivers/gpu/drm/i915/i915_reg.h M drivers/gpu/drm/i915/intel_pm.c M drivers/gpu/drm/i915/intel_pm.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_pm.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.h Auto-merging drivers/gpu/drm/i915/intel_pm.c Auto-merging drivers/gpu/drm/i915/i915_reg.h Auto-merging drivers/gpu/drm/i915/i915_irq.c Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c Auto-merging drivers/gpu/drm/i915/display/intel_display.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/mtl: Add support for PM DEMAND 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".
