Re: linux-next: Tree for July 9

[Stephen Rothwell]

Hi Alan,

On Wed, 9 Jul 2008 15:59:57 +0100 Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> wrote:
>
> On Wed, 9 Jul 2008 18:30:47 +1000
> Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 
> > Temporarily dropped tree: ttydev (since it would not import on top of any
> > tree I have)
> 
> I can make no sense of this as it applies cleanly on top of your tree.

And so it does, sorry.  I noticed in previous emails that you said you
had based the ttydev series on the firmware tree, so I tried to apply it
there and it failed.  I am still tired after Monday's attempt to build
the linux-next tree failed (not because of ttydev since I never got that
far :-().

I assume that you were never informed about how I work with quilt series
and I am sorry for that.  Here it is:

I collect the series in the morning (my time) and then import it into a
branch of its own based on the commit id in the BASE or NEXT-BASE comment
at the top of the series file.  Because the developer has chosen whee the
branch is based, the patches should always apply cleanly.  This branch
then gets merged into that days linux-next at some point.

So, I need a series based on something that is *not* linux-next itself
(otherwise merging the branch will pull in all of the previous version of
linux-next - bad :-)). It can be based on something that is merged into
linux-next (either named in a NEXT-BASE comment or a SHA1 if the base
tree is never rebased).  If this causes me to fix up merge conflicts,
then that is fine (up to a point, of course) what I can't do easily is
fix up when a patch will not apply in the middle of a series.

Therefore, you should pick a nice stable place to base your tree on.
This base can change from day to day and some do. 

Remember that you have to get your series of patches into Linus' tree
eventually and when you do that, all the things in linux-next may not
have been merged yet (or much more may have been).  Part of what
linux-next is for is to take what you intend to send to Linus and try to
merge it with all the other stuff that is headed his way to see how much
of a mess we get into - and in some cases to change things so that we
minimise that mess.

Hope this is helpful.  If not, please note what time it is here :-)

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature