[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Add fault injection support (rev2)

[Patchwork]

== Series Details ==

Series: drm/i915: Add fault injection support (rev2)
URL   : https://patchwork.freedesktop.org/series/4385/
State : failure

== Summary ==

Series 4385v2 drm/i915: Add fault injection support
2016-03-14T08:58:17.234391 http://patchwork.freedesktop.org/api/1.0/series/4385/revisions/2/mbox/
Applying: drm/i915: Add fault injection support
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_dma.c
M	drivers/gpu/drm/i915/i915_drv.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/i915_dma.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_dma.c
Patch failed at 0001 drm/i915: Add fault injection support