From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from caramon.arm.linux.org.uk ([78.32.30.218]:43650 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751950Ab0CYWmh (ORCPT ); Thu, 25 Mar 2010 18:42:37 -0400 Date: Thu, 25 Mar 2010 22:42:25 +0000 From: Russell King - ARM Linux Subject: Re: [GIT PULL] generic arm for MSM Message-ID: <20100325224225.GJ24984@n2100.arm.linux.org.uk> References: <1269553937.21793.40.camel@c-dwalke-linux.qualcomm.com> <20100325222959.GI24984@n2100.arm.linux.org.uk> <1269556378.21793.47.camel@c-dwalke-linux.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1269556378.21793.47.camel@c-dwalke-linux.qualcomm.com> Sender: linux-arm-msm-owner@vger.kernel.org List-ID: To: Daniel Walker Cc: linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org On Thu, Mar 25, 2010 at 03:32:58PM -0700, Daniel Walker wrote: > On Thu, 2010-03-25 at 22:29 +0000, Russell King - ARM Linux wrote: > > On Thu, Mar 25, 2010 at 02:52:17PM -0700, Daniel Walker wrote: > > > These are all mostly small patches that I've sent out a few times with > > > no comments. Let me know if you see any issues. > > > > > > The following changes since commit 7ee744f22ffad619e23912a22d1b2795e10ed825: > > > Stephen Rothwell (1): > > > Add linux-next specific files for 20100324 > > > > This doesn't seem to be in Linus' tree - ah, no, it's based on linux-next. > > So, if I pull this, I get everyone's work into my tree. To see what > > you're actually sending me, do this: > > > > git diff --stat 9353685.. > > > > and it'll show you what you're sending me which isn't in my 'devel' branch > > already - and if you replace that git id with the latest Linus' commit in > > your tree... > > > > So no thanks. Will not pull the entire linux-next tree into mine. > > Oh please why not! (just joking) .. > > > Please build your tree on a more stable base, such as Linus' tree. > > I thought you wanted stuff on your development tree? Where can I get > that other than in next? It's easy enough to put it on a linus tree if > that's acceptable. I've stated in the past that my 'devel' branch is a convenience thing; it saves me having to regularly - nightly - email SFR to say "you need branches A,B,C,D,E,F,G,H,I,J and K". As such, it's regularly regenerated from a series of topic branches, and so at least the top commit is not stable. What I will object to are trees based on linux-next or my devel branch. If you have a dependence on something in my tree, please talk to me and I can shift it over to the 'devel-stable' branch (which as the name says, means that it *is* stable and thus can be used as a basis for trees.) I'm presently basing my topic branches off of Linus' commit 3971047. You can use that, or one of the -rc releases, or Linus' current tip. I don't mind which.