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=-6.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 EA4B7C433E4 for ; Tue, 28 Jul 2020 08:28:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C9D272075D for ; Tue, 28 Jul 2020 08:28:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="CPYuQwuY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728181AbgG1I2g (ORCPT ); Tue, 28 Jul 2020 04:28:36 -0400 Received: from mail29.static.mailgun.info ([104.130.122.29]:46697 "EHLO mail29.static.mailgun.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728147AbgG1I2g (ORCPT ); Tue, 28 Jul 2020 04:28:36 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1595924916; h=Content-Transfer-Encoding: Content-Type: In-Reply-To: MIME-Version: Date: Message-ID: From: References: Cc: To: Subject: Sender; bh=JsZFMI5l/wCWWGprGiEt11W9Nl9giP5BK5ShNxbLSLs=; b=CPYuQwuYVXQFCgZLssqfYLa1ka9JKjFFr/vVWQ1kHhvW6APKsAqpQYTsBUQo/dnOY18How3R Q2TGP3qc664DKnp7HzGlFrMo5OmjEXtM9LiCT2NrIckETLUEeKru2cu46xm9J9cZ84a9Y3RI +kUTB9ngrWsaKcOX2M2aP9vF8ig= X-Mailgun-Sending-Ip: 104.130.122.29 X-Mailgun-Sid: WyI0MWYwYSIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n03.prod.us-east-1.postgun.com with SMTP id 5f1fe134a61bb9e3f57d16bd (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Tue, 28 Jul 2020 08:26:28 GMT Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 76611C433CB; Tue, 28 Jul 2020 08:26:27 +0000 (UTC) Received: from [192.168.0.102] (unknown [49.204.127.128]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sivaprak) by smtp.codeaurora.org (Postfix) with ESMTPSA id 8D6D3C433C9; Tue, 28 Jul 2020 08:26:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 8D6D3C433C9 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=sivaprak@codeaurora.org Subject: Re: linux-next: manual merge of the devicetree tree with the pci tree To: Stephen Rothwell , Rob Herring , Bjorn Helgaas Cc: Linux Next Mailing List , Linux Kernel Mailing List , Ansuel Smith , Lorenzo Pieralisi References: <20200728154903.51a60b8e@canb.auug.org.au> From: Sivaprakash Murugesan Message-ID: Date: Tue, 28 Jul 2020 13:56:21 +0530 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200728154903.51a60b8e@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 7/28/2020 11:19 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the devicetree tree got a conflict in: > > Documentation/devicetree/bindings/pci/qcom,pcie.txt > > between commits: > > 736ae5c91712 ("dt-bindings: PCI: qcom: Add missing clks") > b11b8cc161de ("dt-bindings: PCI: qcom: Add ext reset") > d511580ea9c2 ("dt-bindings: PCI: qcom: Add ipq8064 rev 2 variant") > > from the pci tree and commit: > > 70172d196947 ("dt-bindings: pci: convert QCOM pci bindings to YAML") > > from the devicetree tree. > > I don;t know how to fixed it up so I just left the latter one . 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. Rob/Bjorn, Please let me know if I can provide a patch rebased to linux-next. Bjorn can pick up the patch after review and Rob can drop the old pci yaml conversion patch. let me know your thoughts. >