[Intel-gfx] ✗ Fi.CI.BAT: failure for Add XYUV format support (rev9)
Patchwork
patchwork at emeril.freedesktop.org
Thu Nov 8 11:58:41 UTC 2018
== Series Details ==
Series: Add XYUV format support (rev9)
URL : https://patchwork.freedesktop.org/series/48007/
State : failure
== Summary ==
Applying: drm: Introduce new DRM_FORMAT_XYUV
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
error: Failed to merge in the changes.
Patch failed at 0001 drm: Introduce new DRM_FORMAT_XYUV
Use 'git am --show-current-patch' to see the failed 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 Intel-gfx
mailing list