[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: clean up aliasing_gtt_bind_vma

[Patchwork]

== Series Details ==

Series: drm/i915: clean up aliasing_gtt_bind_vma
URL   : https://patchwork.freedesktop.org/series/4815/
State : failure

== Summary ==

Series 4815v1 drm/i915: clean up aliasing_gtt_bind_vma
2016-03-23T15:56:28.165993 http://patchwork.freedesktop.org/api/1.0/series/4815/revisions/1/mbox/
Applying: drm/i915: clean up aliasing_gtt_bind_vma
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_gem_gtt.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c
Patch failed at 0001 drm/i915: clean up aliasing_gtt_bind_vma