Hi Alasdair,
On Mon, 15 Dec 2008 11:58:23 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the device-mapper tree got a conflict in
> drivers/md/dm.c between commit 0bfc24559d7945506184d86739fe365a181f06b7
> ("blktrace: port to tracepoints, update") from the ftrace tree and commit
> 758cc022ae793c8418fca30ed1e30466efaae37a ("dm-request-add-caches") from
> the device-mapper tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
> http://www.canb.auug.org.au/~sfr/
>
> diff --cc drivers/md/dm.c
> index 343094c,50a1f10..0000000
> --- a/drivers/md/dm.c
> +++ b/drivers/md/dm.c
> @@@ -52,8 -53,27 +54,29 @@@ struct dm_target_io
> union map_info info;
> };
>
> + /*
> + * For request-based dm.
> + * One of these is allocated per request.
> + */
> + struct dm_rq_target_io {
> + struct mapped_device *md;
> + struct dm_target *ti;
> + struct request *orig, clone;
> + int error;
> + union map_info info;
> + };
> +
> + /*
> + * For request-based dm.
> + * One of these is allocated per bio.
> + */
> + struct dm_rq_clone_bio_info {
> + struct bio *orig;
> + struct request *rq;
> + };
> +
> +DEFINE_TRACE(block_bio_complete);
> +
> union map_info *dm_get_mapinfo(struct bio *bio)
> {
> if (bio && bio->bi_private)
This conflict is now between the device-mapper tree and Linus' tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpQ6Xkak0G28.pgp
Description: PGP signature
