linux-kernel - Re: linux-next: manual merge of the akpm-current tree with the fscache 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: <1878041.1614704358@warthog.procyon.org.uk>
Date:   Tue, 02 Mar 2021 16:59:18 +0000
From:   David Howells <dhowells@...hat.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     dhowells@...hat.com, Andrew Morton <akpm@...ux-foundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        "Matthew Wilcox (Oracle)" <willy@...radead.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the fscache tree

Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> This is now a conflict between the fscache tree and Linus' tree.

I've rebased to -rc1 and repushed.

David