linux-kernel - Re: linux-next: manual merge of the folio tree with the ubifs-fixes 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]

Date:   Wed, 23 Mar 2022 23:17:56 +0100 (CET)
From:   Richard Weinberger <richard@....at>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Matthew Wilcox <willy@...radead.org>,
        linux-kernel <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        chengzhihao1 <chengzhihao1@...wei.com>
Subject: Re: linux-next: manual merge of the folio tree with the ubifs-fixes
 tree

----- Ursprüngliche Mail -----
> This is now a conflict between the ubifs-fixes tree and Linus' tree.

Thanks for letting me know, I'll note this in my PR to Linus.

Thanks,
//richard