From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B8B3C433EF for ; Wed, 16 Mar 2022 01:12:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240660AbiCPBNZ (ORCPT ); Tue, 15 Mar 2022 21:13:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345769AbiCPBNZ (ORCPT ); Tue, 15 Mar 2022 21:13:25 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 226C95DA59; Tue, 15 Mar 2022 18:12:12 -0700 (PDT) Received: from kwepemi100024.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4KJByn3nKTzCql8; Wed, 16 Mar 2022 09:10:09 +0800 (CST) Received: from kwepemm600013.china.huawei.com (7.193.23.68) by kwepemi100024.china.huawei.com (7.221.188.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 16 Mar 2022 09:12:10 +0800 Received: from [10.174.178.46] (10.174.178.46) by kwepemm600013.china.huawei.com (7.193.23.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Wed, 16 Mar 2022 09:12:09 +0800 Subject: Re: linux-next: manual merge of the folio tree with the ubifs-fixes tree To: Stephen Rothwell , Matthew Wilcox , Richard Weinberger CC: Linux Kernel Mailing List , "Linux Next Mailing List" References: <20220315205259.71b4238a@canb.auug.org.au> From: Zhihao Cheng 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 X-Originating-IP: [10.174.178.46] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemm600013.china.huawei.com (7.193.23.68) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org 在 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