== Summary == HEAD is now at 8fb2fee drm-intel-nightly: 2016y-01m-14d-13h-06m-44s UTC integration manifest Applying: drm/i915/bxt: Check BIOS RC6 setup before enabling RC6 Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/i915_gem_stolen.c M drivers/gpu/drm/i915/i915_reg.h M drivers/gpu/drm/i915/intel_drv.h M drivers/gpu/drm/i915/intel_pm.c M drivers/gpu/drm/i915/intel_uncore.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_uncore.c Auto-merging drivers/gpu/drm/i915/intel_pm.c Auto-merging drivers/gpu/drm/i915/intel_drv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h Auto-merging drivers/gpu/drm/i915/i915_reg.h Auto-merging drivers/gpu/drm/i915/i915_gem_stolen.c Auto-merging drivers/gpu/drm/i915/i915_drv.h Patch failed at 0001 drm/i915/bxt: Check BIOS RC6 setup before enabling RC6 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
