From: Mike Snitzer <snitzer@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alasdair G Kergon <agk@redhat.com>, Jens Axboe <axboe@kernel.dk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the device-mapper tree with the block tree
Date: Fri, 10 Jun 2016 13:01:59 -0400 [thread overview]
Message-ID: <20160610170159.GA29366@redhat.com> (raw)
In-Reply-To: <20160609140253.183a1428@canb.auug.org.au>
On Thu, Jun 09 2016 at 12:02am -0400,
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Thu, 9 Jun 2016 13:59:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > 50d14ab0130a ("dm: move request-based code out to dm-rq.[hc]")
>
> By the way, resolving these conflicts would have been easier if this
> commit had been split into "move with no changes" followed by "small
> changes" commits.
Yeap, I understand. I've folded your fix into the appropriate commit
and rebased DM's for-next (and dm-4.8) ontop of block's for-4.8/core.
Thanks,
Mike
next prev parent reply other threads:[~2016-06-10 17:02 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-09 3:59 linux-next: manual merge of the device-mapper tree with the block tree Stephen Rothwell
2016-06-09 4:02 ` Stephen Rothwell
2016-06-10 17:01 ` Mike Snitzer [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-07-28 3:14 Stephen Rothwell
2022-07-28 3:23 ` Ming Lei
2022-03-30 22:44 Stephen Rothwell
2022-04-01 5:20 ` Christoph Hellwig
2022-04-01 16:28 ` Mike Snitzer
2021-08-10 1:55 Stephen Rothwell
2020-07-09 3:21 Stephen Rothwell
2020-05-22 5:17 Stephen Rothwell
2018-12-10 3:43 Stephen Rothwell
2018-12-10 3:55 ` Jens Axboe
2018-12-10 5:13 ` Mike Snitzer
2016-07-21 3:27 Stephen Rothwell
2016-07-18 4:09 Stephen Rothwell
2015-09-02 2:39 Stephen Rothwell
2013-12-17 2:16 Stephen Rothwell
2010-07-06 4:33 Stephen Rothwell
2010-07-06 14:30 ` Mike Snitzer
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=20160610170159.GA29366@redhat.com \
--to=snitzer@redhat.com \
--cc=agk@redhat.com \
--cc=axboe@kernel.dk \
--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).