From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751570Ab1F1WkN (ORCPT <rfc822;w@1wt.eu>);
	Tue, 28 Jun 2011 18:40:13 -0400
Received: from earthlight.etchedpixels.co.uk ([81.2.110.250]:58887 "EHLO
	www.etchedpixels.co.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
	with ESMTP id S1750788Ab1F1WkH (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 28 Jun 2011 18:40:07 -0400
Date: Tue, 28 Jun 2011 23:42:35 +0100
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: Jiri Kosina <jkosina@suse.cz>
Cc: Greg KH <greg@kroah.com>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 03/29] gma500: Ensure the frame buffer has a linear
 virtual mapping
Message-ID: <20110628234235.35cbc7bd@lxorguk.ukuu.org.uk>
In-Reply-To: <alpine.LNX.2.00.1106290013350.11049@pobox.suse.cz>
References: <20110616160104.6039.44019.stgit@localhost.localdomain>
	<20110616160642.6039.31781.stgit@localhost.localdomain>
	<20110628211859.GA23217@kroah.com>
	<20110628230245.4cec6958@lxorguk.ukuu.org.uk>
	<alpine.LNX.2.00.1106290003060.11049@pobox.suse.cz>
	<alpine.LNX.2.00.1106290013350.11049@pobox.suse.cz>
X-Mailer: Claws Mail 3.7.9 (GTK+ 2.22.0; x86_64-redhat-linux-gnu)
Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAFVBMVEWysKsSBQMIAwIZCwj///8wIhxoRDXH9QHCAAABeUlEQVQ4jaXTvW7DIBAAYCQTzz2hdq+rdg494ZmBeE5KYHZjm/d/hJ6NfzBJpp5kRb5PHJwvMPMk2L9As5Y9AmYRBL+HAyJKeOU5aHRhsAAvORQ+UEgAvgddj/lwAXndw2laEDqA4x6KEBhjYRCg9tBFCOuJFxg2OKegbWjbsRTk8PPhKPD7HcRxB7cqhgBRp9Dcqs+B8v4CQvFdqeot3Kov6hBUn0AJitrzY+sgUuiA8i0r7+B3AfqKcN6t8M6HtqQ+AOoELCikgQSbgabKaJW3kn5lBs47JSGDhhLKDUh1UMipwwinMYPTBuIBjEclSaGZUk9hDlTb5sUTYN2SFFQuPe4Gox1X0FZOufjgBiV1Vls7b+GvK3SU4wfmcGo9rPPQzgIabfj4TYQo15k3bTHX9RIw/kniir5YbtJF4jkFG+dsDK1IgE413zAthU/vR2HVMmFUPIHTvF6jWCpFaGw/A3qWgnbxpSm9MSmY5b3pM1gvNc/gQfwBsGwF0VCtxZgAAAAASUVORK5CYII=
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

> I can either drop the gma500 bits I have queued now (and stop applying 
> anything touching it, hard rule), or you rebasing on top of Greg's staging 
> tree instead of linux-next (and I sorting out the merge conflict later).

If you can drop the gma500 bits and send them my way I'll merge them via
the gma500 pile.