linux-kernel - Re: [GIT PULL] XArray for 4.19

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20180822182338.GA19458@bombadil.infradead.org>
Date:   Wed, 22 Aug 2018 11:23:38 -0700
From:   Matthew Wilcox <willy@...radead.org>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     linux-mm <linux-mm@...ck.org>,
        linux-fsdevel <linux-fsdevel@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] XArray for 4.19

On Tue, Aug 21, 2018 at 08:00:18PM -0700, Linus Torvalds wrote:
> On Tue, Aug 21, 2018 at 7:50 PM Matthew Wilcox <willy@...radead.org> 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.