[Intel-gfx] ✗ Fi.CI.BAT: failure for Enable Plane Input CSC for ICL (rev6)
patchwork at emeril.freedesktop.org
Thu Nov 1 09:24:56 UTC 2018
== Series Details ==
Series: Enable Plane Input CSC for ICL (rev6)
URL : https://patchwork.freedesktop.org/series/51463/
State : failure
== Summary ==
Applying: drm/i915/icl: Define Plane Input CSC Coefficient Registers
Applying: drm/i915/icl: Enable Plane Input CSC for YUV to RGB Conversion
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sprite.c
error: Failed to merge in the changes.
Patch failed at 0002 drm/i915/icl: Enable Plane Input CSC for YUV to RGB Conversion
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".
More information about the Intel-gfx