== Series Details == Series: drm/i915: Use a bitmask for bigjoiner state tracking (rev4) URL : https://patchwork.freedesktop.org/series/99680/ State : failure == Summary == Applying: drm/i915: Flag crtc scaling_filter changes as modeset 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 No changes -- Patch already applied. Applying: drm/i915: Fix bigjoiner state copy fails 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: Fix bigjoiner state copy fails 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".
