[igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/4] lib/color_encoding: Prepare support for HDR modes. (rev3)

Patchwork
2019-02-05T15:19:43Z

== Series Details ==

Series: series starting with [i-g-t,1/4] lib/color_encoding: Prepare support for HDR modes. (rev3)
URL : https://patchwork.freedesktop.org/series/56083/
State : failure

== Summary ==

Applying: lib/color_encoding: Prepare support for HDR modes.
Using index info to reconstruct a base tree...
M lib/igt_fb.c
Falling back to patching base and 3-way merge...
Auto-merging lib/igt_fb.c
CONFLICT (content): Merge conflict in lib/igt_fb.c
Patch failed at 0001 lib/color_encoding: Prepare support for HDR modes.
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".