Hi Jens,
After merging the block tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/mtd/mtd_blkdevs.c: In function 'mtd_blktrans_cease_background':
drivers/mtd/mtd_blkdevs.c:127: error: implicit declaration of function 'elv_queue_empty'
Caused by commit 7eaceaccab5f ("block: remove per-queue plugging")
interacting with commit c7519dbf6f4b ("mtd_blkdevs: Add background
processing support") from the mtd tree.
I have no idea how to fix this up, so I have reverted the above commit
from them mtd tree (along with commits a32159024620 "mtd: Add mtdswap
block driver" and 89d8d32060de "mtd: fix printf format warnings, mostly
lack of %zd for size_t, in mtdswap" that depend on it).
Jens, maybe you could advise the mtd guys.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
Hi all,
On Mon, 14 Mar 2011 16:19:19 +1100 Stephen Rothwell <[email protected]> wrote:
>
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/mtd/mtd_blkdevs.c: In function 'mtd_blktrans_cease_background':
> drivers/mtd/mtd_blkdevs.c:127: error: implicit declaration of function 'elv_queue_empty'
>
> Caused by commit 7eaceaccab5f ("block: remove per-queue plugging")
> interacting with commit c7519dbf6f4b ("mtd_blkdevs: Add background
> processing support") from the mtd tree.
>
> I have no idea how to fix this up, so I have reverted the above commit
> from them mtd tree (along with commits a32159024620 "mtd: Add mtdswap
> block driver" and 89d8d32060de "mtd: fix printf format warnings, mostly
> lack of %zd for size_t, in mtdswap" that depend on it).
>
> Jens, maybe you could advise the mtd guys.
Ping?
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On 2011-03-17 00:32, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 14 Mar 2011 16:19:19 +1100 Stephen Rothwell <[email protected]> wrote:
>>
>> After merging the block tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/mtd/mtd_blkdevs.c: In function 'mtd_blktrans_cease_background':
>> drivers/mtd/mtd_blkdevs.c:127: error: implicit declaration of function 'elv_queue_empty'
>>
>> Caused by commit 7eaceaccab5f ("block: remove per-queue plugging")
>> interacting with commit c7519dbf6f4b ("mtd_blkdevs: Add background
>> processing support") from the mtd tree.
>>
>> I have no idea how to fix this up, so I have reverted the above commit
>> from them mtd tree (along with commits a32159024620 "mtd: Add mtdswap
>> block driver" and 89d8d32060de "mtd: fix printf format warnings, mostly
>> lack of %zd for size_t, in mtdswap" that depend on it).
>>
>> Jens, maybe you could advise the mtd guys.
>
> Ping?
Can you point me at the commit in question? Generally, elv_queue_empty()
can be replaced by blk_peek_request().
--
Jens Axboe
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
--
David Woodhouse Open Source Technology Centre
[email protected] Intel Corporation
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
Hi Guys,
On Thu, 17 Mar 2011 11:45:35 +0100 Jens Axboe <[email protected]> wrote:
>
> 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.
I am still reverting those three commits from the mtd tree ... David, I
assume that you are going to want to ask Linus to merge the mtd tree at
some point soon?
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/