[Intel-gfx] ✗ Fi.CI.BAT: failure for gvt: Hacking i915 for GVT context requirement

[Patchwork]

== Summary ==

Series 3576v1 gvt: Hacking i915 for GVT context requirement
2016-02-18T11:45:34.820959 http://patchwork.freedesktop.org/api/1.0/series/3576/revisions/1/mbox/
Applying: drm/i915: factor out i915_pvinfo.h
Applying: drm/i915/gvt: Introduce the basic architecture of GVT-g
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/Kconfig
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/Kconfig
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Kconfig
Patch failed at 0002 drm/i915/gvt: Introduce the basic architecture of GVT-g