== Series Details == Series: Preparatory patches for guardband optimization URL : https://patchwork.freedesktop.org/series/155661/ State : failure
== Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/155661/revisions/1/mbox/ not applied Applying: drm/i915/vrr: Use crtc_vsync_start/end for computing vrr.vsync_start/end Applying: drm/i915/vrr: s/intel_vrr_compute_config_late/intel_vrr_compute_guardband Applying: drm/i915/vblank: Add helper to get correct vblank length Applying: drm/i915/psr: Consider SCL lines when validating vblank for wake latency Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_psr.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_psr.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_psr.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/psr: Consider SCL lines when validating vblank for wake latency 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
