✗ Fi.CI.BAT: failure for Add Plane Color Properties (rev7)

Patchwork
2019-03-28T20:15:01Z

== Series Details ==

Series: Add Plane Color Properties (rev7)
URL : https://patchwork.freedesktop.org/series/30875/
State : failure

== Summary ==

Applying: drm: Add Enhanced Gamma LUT precision structure
Applying: drm: Add Plane Degamma properties
Applying: drm: Add Plane CTM property
Applying: drm: Add Plane Gamma properties
Applying: drm: Define helper function for plane color enabling
Applying: drm/i915: Enable plane color features
Applying: drm/i915: Implement Plane Gamma for Bdw and Gen9 platforms
Applying: drm/i915: Load plane color luts from atomic flip
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
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0008 drm/i915: Load plane color luts from atomic flip
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".