From: Zhihao Cheng <chengzhihao1@huawei.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Matthew Wilcox <willy@infradead.org>,
Richard Weinberger <richard@nod.at>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the folio tree with the ubifs-fixes tree
Date: Wed, 16 Mar 2022 09:12:09 +0800 [thread overview]
Message-ID: <18f05eed-c113-a1b4-e227-0c24e6dec6f5@huawei.com> (raw)
In-Reply-To: <20220315205259.71b4238a@canb.auug.org.au>
在 2022/3/15 17:52, Stephen Rothwell 写道:
> Hi all,
>
> Today's linux-next merge of the folio tree got a conflict in:
>
> fs/ubifs/file.c
>
> between commit:
>
> 3b67db8a6ca8 ("ubifs: Fix to add refcount once page is set private")
>
> from the ubifs-fixes tree and commit:
>
> c337f2f4f746 ("ubifs: Convert from invalidatepage to invalidate_folio")
>
> from the folio tree.
>
> I fixed it up (I hope - 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.
>
This conflict is handled right.
Acked-by: Zhihao Cheng <chengzhihao1@huawei.com>
next prev parent reply other threads:[~2022-03-16 1:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-15 9:52 linux-next: manual merge of the folio tree with the ubifs-fixes tree Stephen Rothwell
2022-03-16 1:12 ` Zhihao Cheng [this message]
2022-03-23 21:56 ` Stephen Rothwell
2022-03-23 22:17 ` Richard Weinberger
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=18f05eed-c113-a1b4-e227-0c24e6dec6f5@huawei.com \
--to=chengzhihao1@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=richard@nod.at \
--cc=sfr@canb.auug.org.au \
--cc=willy@infradead.org \
/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