From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932748AbcFJRCE (ORCPT ); Fri, 10 Jun 2016 13:02:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47852 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750888AbcFJRCC (ORCPT ); Fri, 10 Jun 2016 13:02:02 -0400 Date: Fri, 10 Jun 2016 13:01:59 -0400 From: Mike Snitzer To: Stephen Rothwell Cc: Alasdair G Kergon , Jens Axboe , 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 Message-ID: <20160610170159.GA29366@redhat.com> References: <20160609135932.39c8ddd7@canb.auug.org.au> <20160609140253.183a1428@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160609140253.183a1428@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 10 Jun 2016 17:02:00 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jun 09 2016 at 12:02am -0400, Stephen Rothwell wrote: > Hi all, > > On Thu, 9 Jun 2016 13:59:32 +1000 Stephen Rothwell 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