✗ Fi.CI.BAT: failure for series starting with [1/4] drm: Add P010, P012, P016 format definitions and fourcc
Patchwork
patchwork at emeril.freedesktop.org
Thu Dec 27 13:52:42 UTC 2018
== Series Details ==
Series: series starting with [1/4] drm: Add P010, P012, P016 format definitions and fourcc
URL : https://patchwork.freedesktop.org/series/54496/
State : failure
== Summary ==
Applying: drm: Add P010, P012, P016 format definitions and fourcc
Using index info to reconstruct a base tree...
M drivers/gpu/drm/drm_fourcc.c
M include/uapi/drm/drm_fourcc.h
Falling back to patching base and 3-way merge...
Auto-merging include/uapi/drm/drm_fourcc.h
Auto-merging drivers/gpu/drm/drm_fourcc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_fourcc.c
Patch failed at 0001 drm: Add P010, P012, P016 format definitions and fourcc
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-trybot
mailing list