From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jens Axboe Subject: Re: linux-next: block tree build failure Date: Wed, 26 Nov 2008 12:20:27 +0100 Message-ID: <20081126112026.GJ26308@kernel.dk> References: <20081126212920.f992f7a5.sfr@canb.auug.org.au> <20081126104259.GB6052@elte.hu> <20081126104700.GI26308@kernel.dk> <20081126111621.GA20601@elte.hu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from pasmtpa.tele.dk ([80.160.77.114]:56569 "EHLO pasmtpA.tele.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752186AbYKZLWa (ORCPT ); Wed, 26 Nov 2008 06:22:30 -0500 Content-Disposition: inline In-Reply-To: <20081126111621.GA20601@elte.hu> Sender: linux-next-owner@vger.kernel.org List-ID: To: Ingo Molnar Cc: Stephen Rothwell , linux-next@vger.kernel.org, Mathieu Desnoyers , Arnaldo Carvalho de Melo On Wed, Nov 26 2008, Ingo Molnar wrote: > > * Jens Axboe wrote: > > > > the other direction (you merging ftrace bits) doesnt look too hot, > > > you'd have to pick up: > > > > > > 95 files changed, 5308 insertions(+), 1603 deletions(-) > > > > Lets do that, it's just a single patch here from Arnaldo. I have > > attached it to this email. > > thanks, here's the conversion to tracepoints below. Stephen, you might > want to pick up the blk tree straight away plus the fix below. I already pruned the patch from for-next and updated it, so you should not have any conflicts with or without this being merged. -- Jens Axboe