[Intel-gfx] ✗ Ro.CI.BAT: failure for Reclassify messages from GuC loader/submission (rev4)
Patchwork
patchwork at emeril.freedesktop.org
Fri Aug 19 05:27:57 UTC 2016
== Series Details ==
Series: Reclassify messages from GuC loader/submission (rev4)
URL : https://patchwork.freedesktop.org/series/10918/
State : failure
== Summary ==
Applying: drm: extra printk() wrapper macros
Using index info to reconstruct a base tree...
M include/drm/drmP.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/drmP.h
CONFLICT (content): Merge conflict in include/drm/drmP.h
error: Failed to merge in the changes.
Patch failed at 0001 drm: extra printk() wrapper macros
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 Intel-gfx
mailing list