[Intel-gfx] ✗ Fi.CI.BAT: failure for Enable Gen 7 Observation Architecture

[Patchwork]

== Summary ==

Series 3024v1 Enable Gen 7 Observation Architecture
2016-02-02T21:31:17.176759 http://patchwork.freedesktop.org/api/1.0/series/3024/revisions/1/mbox/
Applying: drm/i915: Add i915 perf infrastructure
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/Makefile
M	drivers/gpu/drm/i915/i915_dma.c
M	drivers/gpu/drm/i915/i915_drv.h
M	include/uapi/drm/i915_drm.h
Falling back to patching base and 3-way merge...
Auto-merging include/uapi/drm/i915_drm.h
Auto-merging drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in 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
Auto-merging drivers/gpu/drm/i915/Makefile
Patch failed at 0001 drm/i915: Add i915 perf infrastructure