linux-kernel - Re: linux-next: manual merge of the btrfs tree with Linus' tree

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] [day] [month] [year] [list]

Message-ID: <20211102224411.53de0883@canb.auug.org.au>
Date:   Tue, 2 Nov 2021 22:44:11 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     David Sterba <dsterba@...e.cz>
Cc:     David Sterba <dsterba@...e.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Qu Wenruo <wqu@...e.com>
Subject: Re: linux-next: manual merge of the btrfs tree with Linus' tree

Hi David,

On Tue, 2 Nov 2021 11:42:44 +0100 David Sterba <dsterba@...e.cz> wrote:
>
> Thanks, it's a bit different that I did as a proposed conflict
> resulution and Linus resolved it in a yet another way. I'll refresh my
> for-next branch today to minimize the conflict surface.

Thanks.  I really could only try to pattern match my resolution.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped