Re: [v2.6.26] what's brewing in x86.git for v2.6.26

[Andrew Morton]

On Thu, 17 Apr 2008 11:30:25 +0200 Ingo Molnar <mingo@xxxxxxx> wrote:

> 
> * Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
> 
> > > > By keeping all this code out of -mm you haven't solved any of the 
> > > > merge/integration problems which we had in 2.6.24-rcX.  They're 
> > > > all still there.  All you did was to push them out of the 
> > > > two-month integrate-and-test period and put them into the 2.6.25 
> > > > merge window instead.
> > > 
> > > ... hm, i think there's really no problem here at all: most of the 
> > > merge problems you cited were due to clearly out-of-tree patches 
> > > that sit in x86.git/testing for the convenience of our testers and 
> > > contributors, that we have no intention to push upstream.
> > 
> > Are those out-of-tree patches also in linux-next? [...]
> 
> yes they are.
> 
> > [...]  The page-flags and prctl changes are there.  And those are 
> > planned for 2.6.26, aren't they?
> 
> you mean kmemcheck? Yes, that's planned. We've been working 4 months 
> non-stop on kmemcheck to make it mergeable and usable, it's at version 7 
> right now, and it caught a handful of real bugs already (such as 
> 63a7138671c - unfortunately not credited in the log to kmemcheck). But 
> because it touches SLUB (because it has to - and they are acked by 
> Pekka) i never had the chance to move it into the for-akpm branch.

Does it really really really need to consume one of our few remaining page
flags?  We'll be in a mess when we run out.

> i guess this will all sort itself out when you rebase -mm to linux-next. 
> Stephen Rothwell is doing an excellent job of resolving interactions 
> between trees.

Yep I expect it'll help in several ways.  (That's why I suggested it!)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/