From: Mike Snitzer <snitzer@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alasdair G Kergon <agk@redhat.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>,
Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: manual merge of the device-mapper tree with the block tree
Date: Tue, 6 Jul 2010 10:30:06 -0400 [thread overview]
Message-ID: <20100706143006.GA16626@redhat.com> (raw)
In-Reply-To: <20100706143313.1d4e2909.sfr@canb.auug.org.au>
On Tue, Jul 06 2010 at 12:33am -0400,
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Alasdair,
>
> Today's linux-next merge of the device-mapper tree got a conflict in
> drivers/md/dm.c between commits 9add80db6089272d6bf13ef6b5dc7b3ddda1a887
> ("dm: stop using q->prepare_flush_fn") and
> 5e27e27e73b5bff903b3c30ffd5a0e17eb95c087 ("block: remove
> q->prepare_flush_fn completely") from the block tree and commit
> 90c50ea6a71bcb1bdf1482007932cc7fb0902455
> ("dm-do-not-initialise-full-request-queue-when-bio-based") from the
> device-mapper tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Hi Stephen,
Your fix is correct, thanks for carrying this until Alasdair gets a
chance to pick it up.
Mike
next prev parent reply other threads:[~2010-07-06 14:30 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-06 4:33 linux-next: manual merge of the device-mapper tree with the block tree Stephen Rothwell
2010-07-06 14:30 ` Mike Snitzer [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-12-17 2:16 Stephen Rothwell
2015-09-02 2:39 Stephen Rothwell
2016-06-09 3:59 Stephen Rothwell
2016-06-09 4:02 ` Stephen Rothwell
2016-06-10 17:01 ` Mike Snitzer
2016-07-18 4:09 Stephen Rothwell
2016-07-21 3:27 Stephen Rothwell
2018-12-10 3:43 Stephen Rothwell
2018-12-10 3:55 ` Jens Axboe
2018-12-10 5:13 ` Mike Snitzer
2020-05-22 5:17 Stephen Rothwell
2020-07-09 3:21 Stephen Rothwell
2021-08-10 1:55 Stephen Rothwell
2022-03-30 22:44 Stephen Rothwell
2022-04-01 5:20 ` Christoph Hellwig
2022-04-01 16:28 ` Mike Snitzer
2022-07-28 3:14 Stephen Rothwell
2022-07-28 3:23 ` Ming Lei
2025-07-18 5:10 Stephen Rothwell
2025-07-18 8:26 ` John Garry
2025-07-18 8:56 ` Stephen Rothwell
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=20100706143006.GA16626@redhat.com \
--to=snitzer@redhat.com \
--cc=agk@redhat.com \
--cc=axboe@kernel.dk \
--cc=fujita.tomonori@lab.ntt.co.jp \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).