== Summary == HEAD is now at 058740f drm-intel-nightly: 2016y-01m-13d-17h-07m-44s UTC integration manifest Applying: drm/i915: Make i915_gem_reset_ring_status() public Applying: drm/i915: Generalise common GPU engine reset request/unrequest code Applying: drm/i915: TDR / per-engine hang recovery support for gen8. Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_dma.c M drivers/gpu/drm/i915/i915_irq.c M drivers/gpu/drm/i915/intel_lrc.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_lrc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c Auto-merging drivers/gpu/drm/i915/i915_irq.c Auto-merging drivers/gpu/drm/i915/i915_dma.c Patch failed at 0003 drm/i915: TDR / per-engine hang recovery support for gen8. _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
