== Series Details == Series: series starting with [v2,1/4] drm/i915: Enable edp psr error interrupts on hsw (rev2) URL : https://patchwork.freedesktop.org/series/40704/ State : failure == Summary == Applying: drm/i915: Enable edp psr error interrupts on hsw Applying: drm/i915: Enable edp psr error interrupts on bdw+ Applying: drm/i915/psr: Control PSR interrupts via debugfs error: Failed to merge in the changes. Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_debugfs.c M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/intel_psr.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_psr.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_psr.c Auto-merging drivers/gpu/drm/i915/i915_drv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/i915_debugfs.c Patch failed at 0003 drm/i915/psr: Control PSR interrupts via debugfs The copy of the patch that failed is found in: .git/rebase-apply/patch 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
