== Series Details == Series: series starting with [1/6] Revert "drm: Use a flexible array member for blob property data" (rev3) URL : https://patchwork.freedesktop.org/series/38886/ State : failure == Summary == Applying: Revert "drm: Use a flexible array member for blob property data" Applying: drm: Remove now pointelss blob->data casts Applying: drm: Verify gamma/degamma LUT size Applying: drm: Introduce drm_color_lut_size() Applying: drm/i915: Remove the blob->data casts error: Failed to merge in the changes. Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_color.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_color.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_color.c Patch failed at 0005 drm/i915: Remove the blob->data casts 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
