From mboxrd@z Thu Jan 1 00:00:00 1970 From: Randy Dunlap Subject: Re: linux-next: Tree for August 6 (block git tree) Date: Fri, 06 Aug 2010 12:06:00 -0700 Message-ID: <4C5C5D18.6050905@oracle.com> References: <20100806132758.6001d416.sfr@canb.auug.org.au> <20100806120456.5eca82b7.randy.dunlap@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from rcsinet10.oracle.com ([148.87.113.121]:33150 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751056Ab0HFTSc (ORCPT ); Fri, 6 Aug 2010 15:18:32 -0400 In-Reply-To: <20100806120456.5eca82b7.randy.dunlap@oracle.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell , axboe@kernel.dk Cc: linux-next@vger.kernel.org, LKML 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. -- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code ***