* linux-next: manual merge of the device-mapper tree
@ 2008-12-15 0:58 Stephen Rothwell
2008-12-31 0:22 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2008-12-15 0:58 UTC (permalink / raw)
To: Alasdair G Kergon; +Cc: linux-next, Ingo Molnar, Kiyoshi Ueda
Hi Alasdair,
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@canb•auug.org.au
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)
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the device-mapper tree
2008-12-15 0:58 linux-next: manual merge of the device-mapper tree Stephen Rothwell
@ 2008-12-31 0:22 ` Stephen Rothwell
2008-12-31 1:27 ` Alasdair G Kergon
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2008-12-31 0:22 UTC (permalink / raw)
To: Alasdair G Kergon; +Cc: linux-next, Ingo Molnar, Kiyoshi Ueda
[-- Attachment #1: Type: text/plain, Size: 1638 bytes --]
Hi Alasdair,
On Mon, 15 Dec 2008 11:58:23 +1100 Stephen Rothwell <sfr@canb•auug.org.au> 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@canb•auug.org.au
> 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@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-01-02 13:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-15 0:58 linux-next: manual merge of the device-mapper tree Stephen Rothwell
2008-12-31 0:22 ` Stephen Rothwell
2008-12-31 1:27 ` Alasdair G Kergon
2009-01-02 13:17 ` Alasdair G Kergon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox