Messages in this thread | | | Date | Mon, 12 Dec 2011 16:26:04 -0500 | From | Konrad Rzeszutek Wilk <> | 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).
| |