== Series Details == Series: Introduce drm sharpness property (rev4) URL : https://patchwork.freedesktop.org/series/138754/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/138754/revisions/4/mbox/ not applied Applying: drm: Introduce sharpness strength property Applying: drm/i915/display: Compute the scaler filter coefficients Applying: drm/i915/display: Enable the second scaler for sharpness Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_panel.c M drivers/gpu/drm/i915/display/skl_scaler.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/skl_scaler.c Auto-merging drivers/gpu/drm/i915/display/intel_panel.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_panel.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0003 drm/i915/display: Enable the second scaler for sharpness 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
