== Series Details == Series: Introduce drm sharpness property (rev3) URL : https://patchwork.freedesktop.org/series/138754/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/138754/revisions/3/mbox/ not applied Applying: drm: Introduce sharpness strength property Applying: drm/i915/display: Compute the scaler filter coefficients .git/rebase-apply/patch:212: new blank line at EOF. + warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/Makefile M drivers/gpu/drm/i915/display/intel_display.c M drivers/gpu/drm/i915/display/intel_display_types.h M drivers/gpu/drm/i915/i915_reg.h M drivers/gpu/drm/xe/Makefile Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/xe/Makefile Auto-merging drivers/gpu/drm/i915/i915_reg.h Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display_types.h Auto-merging drivers/gpu/drm/i915/display/intel_display.c Auto-merging drivers/gpu/drm/i915/Makefile 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: Compute the scaler filter coefficients 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
