[Intel-gfx] ✗ Fi.CI.BAT: failure for Another shot at cruft removal

[Patchwork]

== Series Details ==

Series: Another shot at cruft removal
URL   : https://patchwork.freedesktop.org/series/5033/
State : failure

== Summary ==

Series 5033v1 Another shot at cruft removal
2016-03-30T09:23:14.874392 http://patchwork.freedesktop.org/api/1.0/series/5033/revisions/1/mbox/
Applying: drm/ttm: Remove TTM_HAS_AGP
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/ttm/Makefile
M	drivers/gpu/drm/ttm/ttm_agp_backend.c
M	drivers/gpu/drm/ttm/ttm_page_alloc.c
M	drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
M	include/drm/ttm/ttm_bo_driver.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/ttm/ttm_bo_driver.h
CONFLICT (content): Merge conflict in include/drm/ttm/ttm_bo_driver.h
Patch failed at 0001 drm/ttm: Remove TTM_HAS_AGP