lkml.org 
[lkml]   [2011]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: Tree for Dec 12
On Mon, Dec 12, 2011 at 04:14:44PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20111209:
>
> New tree: remoteproc
>
> Removed tree: arm-lpae (its job is done)
>
> The drm tree gained a conflict against Linus' tree.

Using wholesale the drm tree for the rivers/gpu/drm/nouveau/nouveau_sgdma.c
is the right approach. I tried to create a patch to send to you for it (by
merging drm-next against Linus' tree and running mergetool) - but I don't seem
to get anything out of it (just some fix to the Intel driver).



\
 
 \ /
  Last update: 2011-12-12 22:29    [W:0.072 / U:0.264 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site