== Series Details == Series: Support 64 bpp half float formats URL : https://patchwork.freedesktop.org/series/53212/ State : failure == Summary == Applying: drm/fourcc: Add 64 bpp half float formats Applying: drm: Add optional PIXEL_NORMALIZE_RANGE property to drm_plane Applying: drm/i915: Implement half float formats and pixel normalize property Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_display.c M drivers/gpu/drm/i915/intel_drv.h 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 Auto-merging drivers/gpu/drm/i915/intel_drv.h Auto-merging drivers/gpu/drm/i915/intel_display.c error: Failed to merge in the changes. Patch failed at 0003 drm/i915: Implement half float formats and pixel normalize property Use 'git am --show-current-patch' to see the failed 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
