Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764948AbYFFIdt (ORCPT ); Fri, 6 Jun 2008 04:33:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753702AbYFFIdl (ORCPT ); Fri, 6 Jun 2008 04:33:41 -0400 Received: from mx3.mail.elte.hu ([157.181.1.138]:42995 "EHLO mx3.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753315AbYFFIdk (ORCPT ); Fri, 6 Jun 2008 04:33:40 -0400 Date: Fri, 6 Jun 2008 10:33:22 +0200 From: Ingo Molnar To: Stephen Rothwell Cc: Andrew Morton , linux-next@vger.kernel.org, LKML , the arch/x86 maintainers Subject: Re: linux-next: Tree for June 5 Message-ID: <20080606083322.GC10826@elte.hu> References: <20080605175217.cee497f3.sfr@canb.auug.org.au> <20080605195604.41623687.akpm@linux-foundation.org> <20080606071707.GB9708@elte.hu> <20080606072536.GA19334@elte.hu> <20080606003327.9ac0e91b.akpm@linux-foundation.org> <20080606074137.GA28962@elte.hu> <20080606004743.a78180c3.akpm@linux-foundation.org> <20080606082325.GA10826@elte.hu> <20080606182858.60490e47.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080606182858.60490e47.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.18 (2008-05-17) 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 Content-Length: 1039 Lines: 26 * Stephen Rothwell wrote: > On Fri, 6 Jun 2008 10:23:25 +0200 Ingo Molnar wrote: > > > > hm, which commit is this exactly? I've never hit it myself in > > bisection (and there are days when i bisect -tip several times). > > We'll respin tip/tracing/mmiotrace if it's bisection-hostile. You > > can probably nudge it into building via "git-bisect next". > > See my other email. This is because the ftrace tree does not merge > well with the rcu tree. yeah, we have this fixup in -tip as well, in a structured way: you might want to start tracking the tip/tracing/mmiotrace-mergefixups branch to pick it up. or we could offer you a full auto-tip-next plug-and-play branch as well. (there's no reason to redo all these integration steps) Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/