[Intel-gfx] ✗ Ro.CI.BAT: failure for series starting with drm: Declare that create drm_mm nodes with size 0 is illegal (rev2)

Patchwork patchwork at emeril.freedesktop.org
Thu Aug 4 05:20:42 UTC 2016


== Series Details ==

Series: series starting with drm: Declare that create drm_mm nodes with size 0 is illegal (rev2)
URL   : https://patchwork.freedesktop.org/series/10600/
State : failure

== Summary ==

Applying: drm: Declare that create drm_mm nodes with size 0 is illegal
Applying: drm: Convert drm_vma_manager to embedded interval-tree in drm_mm
Applying: drm: Skip initialising the drm_mm_node->hole_stack
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/drm_mm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/drm_mm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_mm.c
error: Failed to merge in the changes.
Patch failed at 0003 drm: Skip initialising the drm_mm_node->hole_stack
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