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

Date:   Thu, 12 May 2022 20:52:17 +0900
From:   Ryusuke Konishi <konishi.ryusuke@...il.com>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Matthew Wilcox <willy@...radead.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Yang Li <yang.lee@...ux.alibaba.com>
Subject: Re: linux-next: manual merge of the mm tree with the folio tree

On Thu, May 12, 2022 at 5:26 PM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the mm tree got a conflict in:
>
>   fs/nilfs2/inode.c
>
> between commit:
>
>   f132ab7d3ab0 ("fs: Convert mpage_readpage to mpage_read_folio")
>
> from the folio tree and commit:
>
>   e38ed506c42f ("nilfs2: Fix some kernel-doc comments")
>
> from the mm tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks, Stephen.

Andrew,  please once drop

 e38ed506c42f ("nilfs2: Fix some kernel-doc comments")

from -mm tree.   I will resend a modified patch after the folio patch is merged
to the mainline.

Thanks,
Ryusuke Konishi