Subject: Re: linux-next: manual merge of the device-mapper tree with the block tree

From: Mike Snitzer <[email-masked]>
Date: Fri, 10 Jun 2016 13:01:59 -0400

On Thu, Jun 09 2016 at 12:02am -0400,
Stephen Rothwell <[email-masked]> wrote:

> Hi all,
> 
> On Thu, 9 Jun 2016 13:59:32 +1000 Stephen Rothwell <[email-masked]> 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