On Thu, May 12, 2022 at 5:26 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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
