[igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/8] lib: Add clamp() to igt_aux and use it for ycbcr<->rgb conversion (rev4)
Patchwork
patchwork at emeril.freedesktop.org
Thu Mar 1 16:33:21 UTC 2018
== Series Details ==
Series: series starting with [i-g-t,1/8] lib: Add clamp() to igt_aux and use it for ycbcr<->rgb conversion (rev4)
URL : https://patchwork.freedesktop.org/series/39066/
State : failure
== Summary ==
Applying: lib: Add clamp() to igt_aux and use it for ycbcr<->rgb conversion
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
Applying: lib: Clear packed YUV formats to black
Applying: lib: Don't use dumb buffers for YCbCr
Applying: lib: Clean up format_desc
Applying: lib: Add igt_matrix
Applying: lib: Add igt_color_encoding
Applying: lib: Use igt_matrix for ycbcr<->rgb conversion
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 0007 lib: Use igt_matrix for ycbcr<->rgb conversion
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".
More information about the igt-dev
mailing list