✗ Fi.CI.BAT: failure for Improve crc-core driver interface (rev11)
Patchwork
patchwork at emeril.freedesktop.org
Mon Aug 13 14:52:30 UTC 2018
== Series Details ==
Series: Improve crc-core driver interface (rev11)
URL : https://patchwork.freedesktop.org/series/44951/
State : failure
== Summary ==
Applying: drm: crc: Introduce verify_crc_source callback
Using index info to reconstruct a base tree...
M drivers/gpu/drm/drm_debugfs_crc.c
M include/drm/drm_crtc.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/drm_crtc.h
CONFLICT (content): Merge conflict in include/drm/drm_crtc.h
Patch failed at 0001 drm: crc: Introduce verify_crc_source callback
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-trybot
mailing list