[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Handle fb->offsets[] and rewrite fb rotation handling to be more generic (v2) (rev2)

[Patchwork]

== Summary ==

Series 2679v2 drm/i915: Handle fb->offsets[] and rewrite fb rotation handling to be more generic (v2)
2016-01-29T18:01:25.652420 http://patchwork.freedesktop.org/api/1.0/series/2679/revisions/2/mbox/
Applying: drm/i915: Rename the rotated gtt view member to 'rotated'
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_gem_gtt.c
M	drivers/gpu/drm/i915/i915_gem_gtt.h
M	drivers/gpu/drm/i915/intel_display.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: Rename the rotated gtt view member to 'rotated'