== Summary == Series 2895v1 iGVT-g implementation in i915 Apply patch: http://patchwork.freedesktop.org/api/1.0/series/2895/revisions/1/mbox/ Applying: drm/i915/gvt: Introduce the basic architecture of GVT-g 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 Failed to merge in the changes. Patch failed at 0001 drm/i915/gvt: Introduce the basic architecture of GVT-g The copy of the patch that failed is found in: /home/builder/igt/drm-intel/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Unstaged changes after reset: M arch/x86/include/asm/xen/interface.h M drivers/gpu/drm/i915/Kconfig M drivers/gpu/drm/i915/Makefile M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/i915_vgpu.h M include/xen/interface/xen.h Series 2895 revision 1 failed at git-am _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
