Hi Ingo, On Fri, 2009-02-20 at 10:53 +0100, Ingo Molnar wrote: > > Is it a big problem, though? We could do the > > s/PAGE_SIZE/SLUB_MAX_SIZE/g rename as a separate preparational > > patch (without any of the functional changes) and see if Linus > > merges it to mainline... > > Linus does not have to merge the changes - it's enough if both > you and me merge it, then there will be no conflicts if the two > trees are combined - Git will sort it all out. > > Could you prepare such a patch please, merge it into a separate > (and append-only) branch your tree and then send me a pull > request after a bit of testing so i can merge it into the > tracing tree? Aye, aye, cap'n: git pull git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git for-ingo the commit is here in case someone wants to take a look at it: http://git.kernel.org/?p=linux/kernel/git/penberg/slab-2.6.git;a=commitdiff;h=fe1200b63d158b28eef6d4de1e5b5f99c681ba2f Pekka -- 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
