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.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,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 F3432C433E7 for ; Sat, 10 Oct 2020 11:39:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B92D2206CA for ; Sat, 10 Oct 2020 11:39:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730185AbgJJLiD (ORCPT ); Sat, 10 Oct 2020 07:38:03 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:33306 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728618AbgJJKUD (ORCPT ); Sat, 10 Oct 2020 06:20:03 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 18B378A4D91A19AD4512; Sat, 10 Oct 2020 18:01:52 +0800 (CST) Received: from [127.0.0.1] (10.174.177.134) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.487.0; Sat, 10 Oct 2020 18:01:48 +0800 Subject: Re: linux-next: manual merge of the devicetree tree with the mfd tree To: Rob Herring , Krzysztof Kozlowski CC: Stephen Rothwell , Lee Jones , Linux Next Mailing List , "Linux Kernel Mailing List" References: <20201001162237.633d6043@canb.auug.org.au> From: "Leizhen (ThunderTown)" Message-ID: <4ecdefed-c047-a318-a3bf-14bc4bc50b23@huawei.com> Date: Sat, 10 Oct 2020 18:01:47 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.177.134] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020/10/1 20:31, Rob Herring wrote: > On Thu, Oct 1, 2020 at 1:26 AM Krzysztof Kozlowski wrote: >> >> On Thu, 1 Oct 2020 at 08:22, Stephen Rothwell wrote: >>> >>> Hi all, >>> >>> Today's linux-next merge of the devicetree tree got a conflict in: >>> >>> Documentation/devicetree/bindings/mfd/syscon.yaml >>> >>> between commit: >>> >>> 18394297562a ("dt-bindings: mfd: syscon: Merge Samsung Exynos Sysreg bindings") >>> 05027df1b94f ("dt-bindings: mfd: syscon: Document Exynos3 and Exynos5433 compatibles") >>> >>> from the mfd tree and commit: >>> >>> 35b096dd6353 ("dt-bindings: mfd: syscon: add some compatible strings for Hisilicon") >>> >>> from the devicetree 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. >>> >>> -- >>> Cheers, >>> Stephen Rothwell >>> >>> diff --cc Documentation/devicetree/bindings/mfd/syscon.yaml >>> index 0f21943dea28,fc2e85004d36..000000000000 >>> --- a/Documentation/devicetree/bindings/mfd/syscon.yaml >>> +++ b/Documentation/devicetree/bindings/mfd/syscon.yaml >>> @@@ -40,11 -40,10 +40,14 @@@ properties >>> - allwinner,sun50i-a64-system-controller >>> - microchip,sparx5-cpu-syscon >>> - mstar,msc313-pmsleep >>> + - samsung,exynos3-sysreg >>> + - samsung,exynos4-sysreg >>> + - samsung,exynos5-sysreg >>> + - samsung,exynos5433-sysreg >>> - >>> + - hisilicon,hi6220-sramctrl >>> + - hisilicon,pcie-sas-subctrl >>> + - hisilicon,peri-subctrl >>> + - hisilicon,dsa-subctrl >> >> Thanks Stephen, looks good. >> >> Zhei, >> However the Huawei compatibles in the original patch were added not >> alphabetically which messes the order and increases the possibility of >> conflicts. It would be better if the entries were kept ordered. > > I've fixed up the order. Thanks. > > Rob > > . >