[igt-dev] ✗ Fi.CI.BUILD: failure for IGT tests for pre-blending 3D LUT interfaces
Patchwork
patchwork at emeril.freedesktop.org
Tue Oct 4 21:53:25 UTC 2022
== Series Details ==
Series: IGT tests for pre-blending 3D LUT interfaces
URL : https://patchwork.freedesktop.org/series/109402/
State : failure
== Summary ==
Applying: include/drm-uapi: Add 3D LUT structs and its attributes
Using index info to reconstruct a base tree...
M include/drm-uapi/drm_mode.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm-uapi/drm_mode.h
CONFLICT (content): Merge conflict in include/drm-uapi/drm_mode.h
Patch failed at 0001 include/drm-uapi: Add 3D LUT structs and its attributes
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