Date: Tue, 1 Mar 2011 12:24:37 +0000
From: Alan Cox <alan@linux.intel.com>
To: Greg KH <greg@kroah.com>
Cc: Alan Cox <alan@linux.jf.intel.com>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] staging: gma500: Rip out the memory manager
Message-ID: <20110301122437.4477fa65@bob.linux.org.uk>
In-Reply-To: <20110301020302.GA11353@kroah.com>
References: <20110224162440.27093.80825.stgit@localhost.localdomain>
	<20110224162457.27093.32399.stgit@localhost.localdomain>
	<20110301020302.GA11353@kroah.com>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1287
Lines: 34

On Mon, 28 Feb 2011 18:03:02 -0800
Greg KH <greg@kroah.com> 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@linux.intel.com>
> 
> 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.

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