From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934534AbYDQJ6c (ORCPT ); Thu, 17 Apr 2008 05:58:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932262AbYDQJat (ORCPT ); Thu, 17 Apr 2008 05:30:49 -0400 Received: from mx3.mail.elte.hu ([157.181.1.138]:60170 "EHLO mx3.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934125AbYDQJas (ORCPT ); Thu, 17 Apr 2008 05:30:48 -0400 Date: Thu, 17 Apr 2008 11:30:25 +0200 From: Ingo Molnar To: Andrew Morton Cc: linux-kernel@vger.kernel.org, Linus Torvalds , Thomas Gleixner , "H. Peter Anvin" Subject: Re: [v2.6.26] what's brewing in x86.git for v2.6.26 Message-ID: <20080417093025.GA17389@elte.hu> References: <20080416202338.GA6007@elte.hu> <20080417002552.5742ad65.akpm@linux-foundation.org> <20080417083000.GA4935@elte.hu> <20080417014054.ea788f1f.akpm@linux-foundation.org> <20080417090626.GA14383@elte.hu> <20080417021813.04df7912.akpm@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080417021813.04df7912.akpm@linux-foundation.org> User-Agent: Mutt/1.5.17 (2007-11-01) X-ELTE-VirusStatus: clean X-ELTE-SpamScore: -1.5 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.3 -1.5 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Andrew Morton 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. 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. Ingo