linux-kernel - Re: linux-next: manual merge of the mm-stable tree with the cifs 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <3325858.1677054470@warthog.procyon.org.uk>
Date:   Wed, 22 Feb 2023 08:27:50 +0000
From:   David Howells <dhowells@...hat.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     dhowells@...hat.com, Matthew Wilcox <willy@...radead.org>,
        "Vishal Moola (Oracle)" <vishal.moola@...il.com>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Steve French <smfrench@...il.com>,
        Steve French <stfrench@...rosoft.com>,
        Shyam Prasad N <nspmangalore@...il.com>,
        Rohith Surabattula <rohiths.msft@...il.com>,
        Tom Talpey <tom@...pey.com>, Paulo Alcantara <pc@....nz>,
        Jeff Layton <jlayton@...nel.org>, linux-cifs@...r.kernel.org,
        linux-kernel@...r.kernel.org, linux-next@...r.kernel.org
Subject: Re: linux-next: manual merge of the mm-stable tree with the cifs tree

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

> OK, so in the merge of mm-stable, I used the cifs version of
> fs/cifs/file.c with this patch applied.  The merge resolution for that
> file looks like this:

I checked it out and diffed it against mine.  Looks right, thanks!

David