Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/intel_display.c
between commit:
721a09f7393d ("drm/i915: Add primary plane to mask if it's visible")
from Linus' tree and commit:
bd0335b29903 ("drm/i915: Add primary plane to mask if it's visible")
from the drm-intel tree.
I fixed it up (I used the drm-intel tree version) and can carry the fix
as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
