From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Wed, 22 Aug 2018 11:23:38 -0700 From: Matthew Wilcox To: Linus Torvalds Cc: linux-mm , linux-fsdevel , Linux Kernel Mailing List Subject: Re: [GIT PULL] XArray for 4.19 Message-ID: <20180822182338.GA19458@bombadil.infradead.org> References: <20180813161357.GB1199@bombadil.infradead.org> <20180822025040.GA12244@bombadil.infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: owner-linux-mm@kvack.org List-ID: On Tue, Aug 21, 2018 at 08:00:18PM -0700, Linus Torvalds wrote: > On Tue, Aug 21, 2018 at 7:50 PM Matthew Wilcox wrote: > > So, should I have based just on your tree and sent you a description of > > what a resolved conflict should look like? > > Absolutely. > > Or preferably not rebasing at all, just starting from a good solid > base for new development in the first place. Ah, I remember now, it was more complex than a textual conflict. Dan added an entirely new function here: http://git.infradead.org/users/willy/linux-dax.git/commitdiff/c2a7d2a115525d3501d38e23d24875a79a07e15e which needed to be converted to XArray. So I should have pulled in his branch as a merge somewhere close to the end of my series, then done a fresh patch on top of that to convert it? It would have been pretty ugly because he modified a function I deleted. I might try it out just to show how bad it would have been.