Hi Stephen, On Mon, 25 Oct 2010 21:13:27 +1100, Stephen Rothwell wrote: > Hi Jean, > > On Mon, 25 Oct 2010 11:25:19 +0200 Jean Delvare <khali@xxxxxxxxxxxx> wrote: > > > > I thought it was NEXT_BASE, with an underscore not dash? > > Ah, yes, sorry ... (but my scripts actually handle either) > > > And I also expected the trees to be merged in the order shows in: > > http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=blob;f=Next/Trees;hb=HEAD > > > > As pci is listed before i2c, I (wrongly) concluded that everything > > would be fine even without using NEXT_BASE. I stand corrected. > > What actually happens is > I fetch all the trees and quilt series > I import the quilt series to git branches > I merge the trees. > > So you cannot depend on the merge order (which sometimes changes as > well). This makes sense since I have no influence over the order that > the trees get merged by Linus ... If there are dependencies, they need to > be explicit, sorry, using NEXT_BASE in quilt series or merging (sub) > trees for git. OK, I take note. I seem to remember that last time I used NEXT_BASE, I was told that I should only use it if I really had to as it made your work more difficult and was normally not needed. Maybe I understood you wrong back then, or maybe things changed meanwhile. Either way, I'll make sure to use NEXT_BASE from now on each time this seems to be needed. -- Jean Delvare -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
