Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20220512182650.7d1a94c7@canb.auug.org.au> <CAKFNMokFYi4AGd8+B6sT73Pu9k_bAu53-d_u1=0fsiHbz3Jgxg@mail.gmail.com>
 <Yn0Ct66Ww44HDj7S@casper.infradead.org>
In-Reply-To: <Yn0Ct66Ww44HDj7S@casper.infradead.org>
From:   Ryusuke Konishi <konishi.ryusuke@gmail.com>
Date:   Fri, 13 May 2022 01:13:24 +0900
Message-ID: <CAKFNMomq1Cd2oqdM2wZQjWGcKfNCSGRgDe31uN1tX0G9tB8iuQ@mail.gmail.com>
Subject: Re: linux-next: manual merge of the mm tree with the folio tree
To:     Matthew Wilcox <willy@infradead.org>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Yang Li <yang.lee@linux.alibaba.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Thu, May 12, 2022 at 9:51 PM Matthew Wilcox <willy@infradead.org> wrote:
>
> On Thu, May 12, 2022 at 08:52:17PM +0900, Ryusuke Konishi wrote:
> > On Thu, May 12, 2022 at 5:26 PM Stephen Rothwell <sfr@canb.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.
>
> I'd be happy to take this patch through my tree instead, if you point me
> to where I can pick it up (I don't see it on fsdevel or mm).

Thank you for your suggestion.   The patch I signed is below,

 https://lkml.kernel.org/r/1652276316-7791-1-git-send-email-konishi.ryusuke@gmail.com

but I guess it's better to pick up Andrew's, which seems to have been
sent to you
additionally a while ago, if it's OK for Andrew as well.

Regards,
Ryusuke Konishi