[GIT PULL] generic arm for MSM

Russell King - ARM Linux linux at arm.linux.org.uk
Thu Mar 25 18:42:25 EDT 2010


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.



More information about the linux-arm-kernel mailing list