== Series Details == Series: drm/i915/psr: Force PSR probe only after full initialization (rev8) URL : https://patchwork.freedesktop.org/series/73436/ State : failure == Summary == Applying: drm/i915/psr: Force PSR probe only after full initialization Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_psr.c M drivers/gpu/drm/i915/display/intel_psr.h M drivers/gpu/drm/i915/i915_drv.c M drivers/gpu/drm/i915/i915_drv.h Falling back to patching base and 3-way merge... 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_drv.c Auto-merging drivers/gpu/drm/i915/display/intel_psr.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 drm/i915/psr: Force PSR probe only after full initialization 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
