From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Walker <dwalker@fifo99.com>
Subject: Re: linux-next: manual merge of the msm tree with the arm tree
Date: Mon, 18 Oct 2010 14:35:58 -0700
Message-ID: <1287437758.5588.59.camel@c-dwalke-linux.qualcomm.com>
References: <20101018103540.7bd9c535.sfr@canb.auug.org.au>
	 <201010182219.25890.arnd@arndb.de>
	 <1287434251.5588.23.camel@c-dwalke-linux.qualcomm.com>
	 <201010182248.36078.arnd@arndb.de>
	 <1287435928.5588.37.camel@c-dwalke-linux.qualcomm.com>
	 <alpine.LFD.2.00.1010181714090.2764@xanadu.home>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <alpine.LFD.2.00.1010181714090.2764@xanadu.home>
Sender: linux-kernel-owner@vger.kernel.org
To: Nicolas Pitre <nico@fluxnic.net>
Cc: Arnd Bergmann <arnd@arndb.de>, Russell King <rmk@arm.linux.org.uk>, Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jeremy Kerr <jeremy.kerr@canonical.com>, Jeff Ohlstein <johlstei@codeaurora.org>
List-Id: linux-next.vger.kernel.org

On Mon, 2010-10-18 at 17:17 -0400, Nicolas Pitre wrote:
> On Mon, 18 Oct 2010, Daniel Walker wrote:
> 
> > I guess your assuming I send my pull request after Russell's, which
> > isn't necessarily true, and I'd rather not have that dependency if I
> > don't have to. 
> 
> Look, we're not establishing a straight rule here -- just figuring out a 
> way to move forward.  What we're asking you to do is either ask RMK to 
> pull your tree now, or wait until RMK's tree has hit mainline so you can 
> pull Linus' tree and fix the issue yourself before asking Linus to pull, 
> or whatever.  Is some collaboration on your part for this particular 
> issue too much to ask for?

I'm always very cooperative, if you read back in the thread I basically
suggested I would be sending a pull request to Russell. That was prior
to Arnd'd comments.

Daniel