== Series Details == Series: i915 lpsp support for lpsp igt (rev8) URL : https://patchwork.freedesktop.org/series/74648/ State : failure == Summary == Applying: drm/i915: Power well id for ICL PG3 Applying: drm/i915: Add i915_lpsp_capability debugfs Applying: drm/i915: Add connector dbgfs for all connectors Applying: drm/i915: Add i915_lpsp_status debugfs attribute Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_display_debugfs.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_display_debugfs.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display_debugfs.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0004 drm/i915: Add i915_lpsp_status debugfs attribute 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". _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
