Re: [PATCH 2/2] staging: gma500: Rip out the memory manager

From: Greg KH
Date: Tue Mar 01 2011 - 09:22:50 EST


On Tue, Mar 01, 2011 at 12:24:37PM +0000, Alan Cox wrote:
> On Mon, 28 Feb 2011 18:03:02 -0800
> Greg KH <greg@xxxxxxxxx> wrote:
>
> > On Thu, Feb 24, 2011 at 04:25:09PM +0000, Alan Cox wrote:
> > > At this point we simply stuff the display at the start of the
> > > stolen memory area that the BIOS gave us. No user framebuffers no
> > > multiple framebuffers.
> > >
> > > However from here we have a better chance of seeing what is going
> > > on and writing an actual gem manager for the driver.
> > >
> > > Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
> >
> > This doesn't apply.
> >
> > The 1/2 patch had some fuzz in the Makefile, which I fixed up by hand,
> > but it makes me think that you are diffing this against some different
> > tree.
>
> I've investigated this. The cause seems to be a patch
>
> commit 5352161fc449d7a7573b2e13bd02162aae7aeb69
>
> applied by yourself which cleaned up all sorts of random whitespace
> noise and broke further patch application. Given that this is staging
> and random whitespace is less important than actually fixing the code I
> think the fix is to revert that commit and then apply mine.

Well, I did copy you on that patch, and let you know I made it, so this
type of thing wouldn't happen. I'll go fix it by just stripping out the
trailing whitespace from your patch :)

This doesn't seem to explain the Makefile difference in the 1/2 patch
though...

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/