lkml.org 
[lkml]   [2015]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the drm-intel tree with Linus' tree
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@canb.auug.org.au


\
 
 \ /
  Last update: 2015-09-29 03:41    [W:0.027 / U:0.276 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site