== Summary == HEAD is now at 8fe9e78 drm-intel-nightly: 2016y-01m-21d-11h-02m-42s UTC integration manifest Applying: drm/i915/fbc: wait for a vblank instead of 50ms when enabling Applying: drm/i915/fbc: extract intel_fbc_can_activate() Applying: drm/i915/fbc: extract intel_fbc_can_enable() Applying: drm/i915/fbc: introduce struct intel_fbc_reg_params Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/intel_fbc.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_fbc.c Auto-merging drivers/gpu/drm/i915/i915_drv.h Applying: drm/i915/fbc: replace frequent dev_priv->fbc.x with fbc->x Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/intel_fbc.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_fbc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_fbc.c Auto-merging drivers/gpu/drm/i915/i915_drv.h Patch failed at 0005 drm/i915/fbc: replace frequent dev_priv->fbc.x with fbc->x
_______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
