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 X-Spam-Level: X-Spam-Status: No, score=-5.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 781D3C64E7C for ; Thu, 3 Dec 2020 03:48:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 16C0721D7A for ; Thu, 3 Dec 2020 03:48:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727972AbgLCDse (ORCPT ); Wed, 2 Dec 2020 22:48:34 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:8182 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726734AbgLCDsd (ORCPT ); Wed, 2 Dec 2020 22:48:33 -0500 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4CmhcD1YJvz15WqW; Thu, 3 Dec 2020 11:47:24 +0800 (CST) Received: from [10.136.114.67] (10.136.114.67) by smtp.huawei.com (10.3.19.212) with Microsoft SMTP Server (TLS) id 14.3.487.0; Thu, 3 Dec 2020 11:47:49 +0800 Subject: Re: linux-next: manual merge of the block tree with the f2fs tree To: Stephen Rothwell , Jens Axboe , Jaegeuk Kim CC: Chao Yu , Christoph Hellwig , "Linux Kernel Mailing List" , Linux Next Mailing List References: <20201203144348.70f139a9@canb.auug.org.au> From: Chao Yu Message-ID: <047a6e22-2e8a-4c36-bcbc-3108606c58ff@huawei.com> Date: Thu, 3 Dec 2020 11:47:49 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20201203144348.70f139a9@canb.auug.org.au> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.136.114.67] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020/12/3 11:43, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the block tree got conflicts in: > > fs/f2fs/checkpoint.c > fs/f2fs/f2fs.h > fs/f2fs/super.c > > between commit: > > 5c0602188dc7 ("f2fs: fix kbytes written stat for multi-device case") > > from the f2fs tree and commits: > > 8446fe9255be ("block: switch partition lookup to use struct block_device") > 9499ffc75217 ("f2fs: remove a few bd_part checks") > > from the block tree. > > I fixed it up (I think, see below, fs/f2fs/f2fs.h and fs/f2fs/super.c > used the versions from the f2fs tree) 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. > The fix looks good to me. :) Thanks,