linux-kernel - Re: linux-next: manual merge of the vfs-brauner tree with the f2fs 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: <56456d5d-40b0-4d6c-9abf-7cbae1c70b92@kernel.org>
Date: Thu, 5 Sep 2024 12:00:16 +0800
From: Chao Yu <chao@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>,
 Christian Brauner <brauner@...nel.org>, Jaegeuk Kim <jaegeuk@...nel.org>
Cc: 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 vfs-brauner tree with the f2fs
 tree

On 2024/9/5 8:18, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 2 Sep 2024 09:24:05 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>>
>> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>>
>>    fs/f2fs/data.c
>>
>> between commits:
>>
>>    f13c7184e62e ("f2fs: convert f2fs_write_begin() to use folio")
>>    357dd8479f8b ("f2fs: convert f2fs_write_end() to use folio")
>> (and maybe others)
>>
>> from the f2fs tree and commits:
>>
>>    a0f858d450ce ("f2fs: Convert f2fs_write_end() to use a folio")
>>    dfd2e81d37e1 ("f2fs: Convert f2fs_write_begin() to use a folio")
>>    a225800f322a ("fs: Convert aops->write_end to take a folio")
>>    1da86618bdce ("fs: Convert aops->write_begin to take a folio")
>>
>> from the vfs-brauner tree.
>>
>> This was too much for me to fix up, so I just used the f2fs tree from
>> next-20240830 for today.  Please discuss this and fix things up.
> 
> I took another shot at this and *I think* I figured it out - see below
> and I have also attached the final version of this file.  Please check
> and advise.

The fix looks fine.

Thanks,