== Summary == HEAD is now at 24b053a drm-intel-nightly: 2016y-01m-06d-08h-16m-11s UTC integration manifest Applying: drm/i915/guc: Expose (intel)_lr_context_size() Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_lrc.c M drivers/gpu/drm/i915/intel_lrc.h 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 Patch failed at 0001 drm/i915/guc: Expose (intel)_lr_context_size() _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
