Re: linux-next: Tree for August 6 (block git tree)

[Jens Axboe <axboe@kernel.dk>]

On 08/10/2010 12:11 PM, Randy Dunlap wrote:
> On 08/10/10 09:07, Jens Axboe wrote:
>> On 08/10/2010 11:59 AM, Randy Dunlap wrote:
>>> On Tue, 10 Aug 2010 11:56:34 -0400 Jens Axboe wrote:
>>>
>>>> On 08/10/2010 11:54 AM, Randy Dunlap wrote:
>>>>> On 08/10/10 08:51, Jens Axboe wrote:
>>>>>> 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 <linux/blk_types.h>:
>>>>>>>>>
>>>>>>>>> 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?
>>>>>
>>>>> Hi Jens,
>>>>>
>>>>> Maybe I misread last week's email about linux/blk_types.h.
>>>>> (It was about being exported, not about being #included.)
>>>>>
>>>>> There are still lots of these files that have the errors listed above.
>>>>> Has there been a patch for those?
>>>>
>>>> What's the .config?
>>>
>>> I have a bunch of them that fail.  Here are 2 of them,
>>> one with CONFIG_BLOCK=y and one with CONFIG_BLOCK=n.
>>>
>>> I can give you more if you want them.
>>
>> Looks like the types are badly hidden behind CONFIG_BLOCK.
>> So this should fix the CONFIG_BLOCK=n part at least. What
>> was the compile error with CONFIG_BLOCK=y?
> 
> Ugh, it is a staging driver with lots of other problems.
> (spectra)  I wouldn't worry about it for now.
> 
> I'll test this patch.  Thanks.

OK great, I'll push this one out.

-- 
Jens Axboe