✗ Ro.CI.BAT: failure for mega
Patchwork
patchwork at emeril.freedesktop.org
Mon Aug 8 09:50:47 UTC 2016
== Series Details ==
Series: mega
URL : https://patchwork.freedesktop.org/series/10778/
State : failure
== Summary ==
Applying: mega
Using index info to reconstruct a base tree...
M drivers/gpu/drm/Makefile
M drivers/gpu/drm/drm_irq.c
M drivers/gpu/drm/drm_mm.c
M drivers/gpu/drm/drm_vma_manager.c
M drivers/gpu/drm/i915/i915_drv.h
M include/drm/drm_mm.h
M include/drm/drm_vma_manager.h
M include/linux/fence.h
M lib/Kconfig.debug
.git/rebase-apply/patch:4365: trailing whitespace.
if (ret)
.git/rebase-apply/patch:4760: trailing whitespace.
vma = i915_gem_object_ggtt_pin(obj, NULL, 0, 0,
.git/rebase-apply/patch:8134: space before tab in indent.
flags & PIN_HIGH ? DRM_MM_INSERT_HIGH : 0) == 0)
.git/rebase-apply/patch:19278: space before tab in indent.
vma->node.start + LRC_PPHWSP_PN * PAGE_SIZE;
.git/rebase-apply/patch:19379: space before tab in indent.
!HAS_LLC(dev_priv));
warning: 5 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging lib/Kconfig.debug
Auto-merging include/linux/fence.h
Auto-merging include/drm/drm_mm.h
CONFLICT (content): Merge conflict in include/drm/drm_mm.h
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/drm_vma_manager.c
Auto-merging drivers/gpu/drm/drm_mm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_mm.c
Auto-merging drivers/gpu/drm/drm_irq.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_irq.c
Auto-merging drivers/gpu/drm/Makefile
error: Failed to merge in the changes.
Patch failed at 0001 mega
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-trybot
mailing list