[igt-dev] ✗ Fi.CI.BAT: failure for lib/igt_fb: Add support for P01x formats, v2.

Patchwork
2019-02-04T12:49:11Z

== Series Details ==

Series: lib/igt_fb: Add support for P01x formats, v2.
URL : https://patchwork.freedesktop.org/series/56181/
State : failure

== Summary ==

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