From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alasdair G Kergon <agk@redhat•com>
Cc: linux-next@vger•kernel.org, Ingo Molnar <mingo@elte•hu>,
Kiyoshi Ueda <k-ueda@ct•jp.nec.com>
Subject: Re: linux-next: manual merge of the device-mapper tree
Date: Wed, 31 Dec 2008 11:22:49 +1100 [thread overview]
Message-ID: <20081231112249.4a0b68b2.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20081215115823.dc3029d5.sfr@canb.auug.org.au>
[-- 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 --]
next prev parent reply other threads:[~2008-12-31 0:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-15 0:58 linux-next: manual merge of the device-mapper tree Stephen Rothwell
2008-12-31 0:22 ` Stephen Rothwell [this message]
2008-12-31 1:27 ` Alasdair G Kergon
2009-01-02 13:17 ` Alasdair G Kergon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081231112249.4a0b68b2.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agk@redhat$(echo .)com \
--cc=k-ueda@ct$(echo .)jp.nec.com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox