== Summary == HEAD is now at 00a0c7d drm-intel-nightly: 2016y-01m-18d-16h-50m-37s UTC integration manifest Applying: drm/i915: Splitting intel_dp_detect Applying: drm/i915: Cleaning up intel_dp_hpd_pulse Applying: drm/i915: Reorganizing intel_dp_check_link_status Applying: drm/i915: Save sink_count for tracking changes to it Applying: drm/i915: Save sink_count for tracking changes to it and read sink_count dpcd always Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_dp.c M drivers/gpu/drm/i915/intel_drv.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_dp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c Patch failed at 0005 drm/i915: Save sink_count for tracking changes to it and read sink_count dpcd always
_______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
