Re: linux-next: manual merge of the block tree with the mtd tree

[Jens Axboe]

On Wed, Apr 28 2010, Stephen Rothwell wrote:
> Hi Jens,
> 
> Today's linux-next merge of the block tree got a conflict in
> drivers/mtd/mtdcore.c between commit
> b520e412faaaad35641aeedd6059179f9f1b393c ("mtd: Replace static array of
> devices with an idr structure") from the mtd tree and commit
> a33eb6b91034c95b9b08576f68be170f995b2c7d ("Move mtd_bdi_*mappable to
> mtdcore.c") from the block tree.
> 
> Just overlapping additions.  I fixed it up (see below) and can carry the
> fix as necessary.

Thanks, looks good. It should go away soon, as the below bits are for
2.6.34.

-- 
Jens Axboe

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/