== Series Details == Series: Use trans push mechanism to generate frame change event (rev4) URL : https://patchwork.freedesktop.org/series/139830/ State : failure
== Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/139830/revisions/4/mbox/ not applied Applying: drm/i915/psr: Do not trigger Frame Change events from frontbuffer flush 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 Applying: drm/i915/display: Send push before waiting vblanks Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_display.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0002 drm/i915/display: Send push before waiting vblanks 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
