From: Ryusuke Konishi <konishi.ryusuke@gmail•com>
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>
Subject: Re: linux-next: manual merge of the mm tree with the folio tree
Date: Fri, 13 May 2022 01:13:24 +0900 [thread overview]
Message-ID: <CAKFNMomq1Cd2oqdM2wZQjWGcKfNCSGRgDe31uN1tX0G9tB8iuQ@mail.gmail.com> (raw)
In-Reply-To: <Yn0Ct66Ww44HDj7S@casper.infradead.org>
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
next prev parent reply other threads:[~2022-05-12 16:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-12 8:26 linux-next: manual merge of the mm tree with the folio tree Stephen Rothwell
2022-05-12 11:52 ` Ryusuke Konishi
2022-05-12 12:51 ` Matthew Wilcox
2022-05-12 16:13 ` Ryusuke Konishi [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-06-22 5:38 Stephen Rothwell
2022-06-22 7:22 ` Muchun Song
2022-06-22 18:59 ` Andrew Morton
2022-06-23 2:15 ` Muchun Song
2022-06-20 3:53 Stephen Rothwell
2022-05-03 6:14 Stephen Rothwell
2022-05-02 9:36 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAKFNMomq1Cd2oqdM2wZQjWGcKfNCSGRgDe31uN1tX0G9tB8iuQ@mail.gmail.com \
--to=konishi.ryusuke@gmail$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=willy@infradead$(echo .)org \
--cc=yang.lee@linux$(echo .)alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox