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;
Subject: Re: linux-next: manual merge of the folio tree with the ubifs-fixes
 tree
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>
References: <20220315205259.71b4238a@canb.auug.org.au>
From:   Zhihao Cheng <chengzhihao1@huawei.com>
Message-ID: <18f05eed-c113-a1b4-e227-0c24e6dec6f5@huawei.com>
Date:   Wed, 16 Mar 2022 09:12:09 +0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101
 Thunderbird/68.5.0
MIME-Version: 1.0
In-Reply-To: <20220315205259.71b4238a@canb.auug.org.au>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk

在 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>