Messages in this thread | | | Date | Thu, 17 Mar 2011 11:45:35 +0100 | From | Jens Axboe <> | Subject | Re: linux-next: build failure after merge of the block tree |
| |
On 2011-03-17 11:36, David Woodhouse wrote: > On Thu, 2011-03-17 at 10:18 +0000, Jens Axboe wrote: >> >> Can you point me at the commit in question? Generally, >> elv_queue_empty() >> can be replaced by blk_peek_request(). > > The interesting commit is this one: > http://git.infradead.org/mtd-2.6.git/commitdiff/c7519dbf6 > > The point of it is to enable this > http://git.infradead.org/mtd-2.6.git/commitdiff/a32159024
OK, can you commit a change just changing that to blk_peek_request()? That'll avoid the conflict.
-- Jens Axboe
| |