== Series Details == Series: drm/i915: Fix up the CCS code (rev3) URL : https://patchwork.freedesktop.org/series/29308/ State : failure == Summary == Applying: drm/i915: Add a comment exlaining CCS hsub/vsub Applying: drm/i915: Nuke a pointless unreachable() Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_display.c Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: drm/i915: Add the missing Y/Yf modifiers for SKL+ sprites error: Failed to merge in the changes. Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_sprite.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_sprite.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sprite.c Patch failed at 0003 drm/i915: Add the missing Y/Yf modifiers for SKL+ sprites The copy of the patch that failed is found in: .git/rebase-apply/patch 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". _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
