[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Mon, 12 Dec 2011 16:26:04 -0500
From: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: Re: 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).
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists