From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jens Axboe Subject: Re: linux-next: build failure after merge of the final tree (block tree related) Date: Fri, 09 Jul 2010 14:56:24 +0200 Message-ID: <4C371C78.1010701@kernel.dk> References: <20100709143940.f0f06690.sfr@canb.auug.org.au> <201007091454.09011.arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from 0122700014.0.fullrate.dk ([95.166.99.235]:58775 "EHLO kernel.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754816Ab0GIM4Z (ORCPT ); Fri, 9 Jul 2010 08:56:25 -0400 In-Reply-To: <201007091454.09011.arnd@arndb.de> Sender: linux-next-owner@vger.kernel.org List-ID: To: Arnd Bergmann Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org On 2010-07-09 14:54, Arnd Bergmann wrote: > On Friday 09 July 2010, Stephen Rothwell wrote: > >> I applied the following patch for today: >> >> From: Stephen Rothwell >> Date: Fri, 9 Jul 2010 14:24:38 +1000 >> Subject: [PATCH] block: fix for block tracing build error >> >> block/compat_ioctl.c: In function 'compat_blkdev_ioctl': >> block/compat_ioctl.c:754: error: 'BLKTRACESETUP32' undeclared (first use in this function) > > Yes, the fix looks right, sorry about the breakage. > I only tested with CONFIG_BLOCK_TRACE enabled, so I did not > catch this. > > Jens, please apply Stephen's patch. Added, thanks Stephen. -- Jens Axboe