== Summary == Series 2991v1 PSR link standby x link force off changes. 2016-02-01T18:49:22.338593 http://patchwork.freedesktop.org/api/1.0/series/2991/revisions/1/mbox/ Applying: drm/i915: PSR simplify port and link standby checks. Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_psr.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_psr.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_psr.c Patch failed at 0001 drm/i915: PSR simplify port and link standby checks.
_______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
