== Series Details == Series: mtl: add support for pmdemand (rev6) URL : https://patchwork.freedesktop.org/series/116949/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/116949/revisions/6/mbox/ not applied Applying: drm/i915: fix the derating percentage for MTL Applying: drm/i915: update the QGV point frequency calculations Applying: drm/i915: store the peak bw per QGV point Applying: drm/i915: extract intel_bw_check_qgv_points() Applying: drm/i915: modify max_bw to return index to intel_bw_info Applying: drm/i915/mtl: find the best QGV point for the SAGV configuration Applying: drm/i915/mtl: Add support for PM DEMAND Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/Makefile 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 Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_irq.c CONFLICT (content): Merge conflict in 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 Auto-merging drivers/gpu/drm/i915/Makefile 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". Build failed, no error log produced
