linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ryusuke Konishi <konishi.ryusuke@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>,
	Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Matthew Wilcox <willy@infradead.org>,
	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: Thu, 12 May 2022 20:52:17 +0900	[thread overview]
Message-ID: <CAKFNMokFYi4AGd8+B6sT73Pu9k_bAu53-d_u1=0fsiHbz3Jgxg@mail.gmail.com> (raw)
In-Reply-To: <20220512182650.7d1a94c7@canb.auug.org.au>

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.

Thanks,
Ryusuke Konishi

  reply	other threads:[~2022-05-12 11:52 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 [this message]
2022-05-12 12:51   ` Matthew Wilcox
2022-05-12 16:13     ` Ryusuke Konishi
  -- 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='CAKFNMokFYi4AGd8+B6sT73Pu9k_bAu53-d_u1=0fsiHbz3Jgxg@mail.gmail.com' \
    --to=konishi.ryusuke@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=willy@infradead.org \
    --cc=yang.lee@linux.alibaba.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).