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
Date: Tue, 1 Mar 2011 12:24:37 +0000 [thread overview]
Message-ID: <20110301122437.4477fa65@bob.linux.org.uk> (raw)
In-Reply-To: <20110301020302.GA11353@kroah.com>
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
next prev parent reply other threads:[~2011-03-01 12:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-24 16:24 [PATCH 1/2] gma500: Add 2D acceleration Alan Cox
2011-02-24 16:25 ` [PATCH 2/2] gma500: Rip out the memory manager Alan Cox
2011-03-01 2:03 ` [PATCH 2/2] staging: " Greg KH
2011-03-01 12:24 ` Alan Cox [this message]
2011-03-01 14:15 ` Greg KH
2011-03-01 14:29 ` Greg KH
2011-03-01 14:35 ` Alan Cox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110301122437.4477fa65@bob.linux.org.uk \
--to=alan@linux.intel.com \
--cc=alan@linux.jf.intel.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox