From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jens Axboe Subject: Re: linux-next: Tree for August 6 (block git tree) Date: Tue, 10 Aug 2010 11:51:50 -0400 Message-ID: <4C617596.505@kernel.dk> References: <20100806132758.6001d416.sfr@canb.auug.org.au> <20100806120456.5eca82b7.randy.dunlap@oracle.com> <4C5C5D18.6050905@oracle.com> <20100810083737.c761fc8f.randy.dunlap@oracle.com> 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]:51827 "EHLO kernel.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932154Ab0HJPvv (ORCPT ); Tue, 10 Aug 2010 11:51:51 -0400 In-Reply-To: <20100810083737.c761fc8f.randy.dunlap@oracle.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Randy Dunlap Cc: Stephen Rothwell , linux-next@vger.kernel.org, LKML On 08/10/2010 11:37 AM, Randy Dunlap wrote: > On Fri, 06 Aug 2010 12:06:00 -0700 Randy Dunlap wrote: > >> On 08/06/10 12:04, Randy Dunlap wrote: >>> On Fri, 6 Aug 2010 13:27:58 +1000 Stephen Rothwell wrote: >>> >>>> Hi all, >>>> >>>> As the merge window is open, please do not add 2.6.37 material to your >>>> linux-next included trees until after 2.6.36-rc1. >>>> >>>> Changes since 20100805: >>>> >>>> The block tree lost its build failure and a conflict. >>> >>> >>> Lots of source files now need : >>> >>> mm/filemap.c:2164: error: 'REQ_WRITE' undeclared >>> fs/read_write.c:362: error: 'REQ_WRITE' undeclared >>> fs/splice.c:1108: error: 'REQ_WRITE' undeclared >>> fs/aio.c:1496: error: 'REQ_WRITE' undeclared >>> drivers/memstick/core/memstick.c:272: error: 'REQ_WRITE' undeclared >>> drivers/memstick/host/tifm_ms.c:218: error: 'REQ_WRITE' undeclared >>> drivers/memstick/host/jmb38x_ms.c:333: error: 'REQ_WRITE' undeclared >>> drivers/staging/spectra/ffsport.c:277: error: 'REQ_TYPE_LINUX_BLOCK' undeclared >>> fs/compat.c:1274: error: 'REQ_WRITE' undeclared >> >> >> Sorry, I see that this has already been fixed. > > s/fixed/addressed/ but not yet merged into linux-next. > Can we get that fixed, please? Which patch are you referencing? -- Jens Axboe