== Series Details == Series: Introduce GVT context support URL : https://patchwork.freedesktop.org/series/4351/ State : failure == Summary == Series 4351v1 Introduce GVT context support 2016-03-11T10:50:52.806659 http://patchwork.freedesktop.org/api/1.0/series/4351/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/Makefile M drivers/gpu/drm/i915/i915_dma.c M drivers/gpu/drm/i915/i915_drv.h 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 Auto-merging drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/i915_dma.c Auto-merging drivers/gpu/drm/i915/Makefile 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 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
