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 08264C10F1B for ; Tue, 13 Dec 2022 19:53:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230061AbiLMTxU (ORCPT ); Tue, 13 Dec 2022 14:53:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236256AbiLMTxR (ORCPT ); Tue, 13 Dec 2022 14:53:17 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CF4E14002; Tue, 13 Dec 2022 11:53:16 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2013161723; Tue, 13 Dec 2022 19:53:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3B84FC433D2; Tue, 13 Dec 2022 19:53:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670961195; bh=o/yrUZKAS1db7aJ6RKbv6EVfRbxYCjJMYwJQha/ToIA=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=Nn1VH9YNuITNePwg/1QhhZ0R9ittLgVMT+bWWc8oW4H7JMV/GkukBmyzkkFrIsQcV mszR5AJF8pW3p5EGVXOGpn65riMXmcjtNS5vVM4U/90b6V6/pA28kzHD/I58TtTmgP 4pKMkQ6xGTuqEZc/mVrECnkbmYbn63p38oKgeLOjlApw5Hsvhme/Jo1pNNo5l5lmJG jZBXTmLBI8rw9CMRqLLZMoD9FwqU1LhMgCC7MV1+ngznISCWZrOBotyJn9Buvx2rBH lafUFBfKzqOlTYUXdzemEn+c74waDJfVmLoXx9YM38oLaJOru/iyGFmkidfV3T1eTC IuXJ2zYClCRcw== Date: Tue, 13 Dec 2022 13:53:13 -0600 From: Bjorn Helgaas To: Serge Semin Cc: Thierry Reding , Vidya Sagar , Jon Hunter , Bjorn Helgaas , Olof Johansson , Arnd Bergmann , ARM , Linux Kernel Mailing List , Linux Next Mailing List , Lorenzo Pieralisi , Stephen Rothwell , Rob Herring Subject: Re: linux-next: manual merge of the pci tree with the arm-soc tree Message-ID: <20221213195313.GA200257@bhelgaas> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221213190310.sztjn5nnwuubrtbg@mobilestation> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Tue, Dec 13, 2022 at 10:03:10PM +0300, Serge Semin wrote: > On Tue, Dec 13, 2022 at 05:48:53PM +0100, Thierry Reding wrote: > > On Tue, Dec 13, 2022 at 10:21:03AM -0600, Bjorn Helgaas wrote: > > > On Mon, Dec 05, 2022 at 09:57:38AM +1100, Stephen Rothwell wrote: > > > > Hi all, > > > > > > > > Today's linux-next merge of the pci tree got a conflict in: > > > > > > > > Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml > > > > > > > > between commit: > > > > > > > > 5c3741492d2e ("dt-bindings: PCI: tegra234: Add ECAM support") > > > > > > > > from the arm-soc tree and commit: > > > > > > > > 4cc13eedb892 ("dt-bindings: PCI: dwc: Add reg/reg-names common properties") > > > > > > > > from the pci tree. > > > > > > > > I didn't know how to fix this up, so I just used the latter (and so lost > > > > the addition of "ecam"). > > > > > > Did I miss a suggested resolution for this? > > > > > We had a brief discussion about this in another thread. So basically > > Stephen's resolution is fine here and the plan is to instead add the > > ECAM bits that the Tegra patch does in a separate patch on top of > > Serge's patch. I should get around to sending that patch tomorrow. > > > > Thierry > > Actually the discussion still goes. I haven't got a respond to my > last suggestion which seems to me more reasonable than extending the > DT-bindings with another vendor-specific reg-name. @Bjorn, please join > the discussion here: > https://lore.kernel.org/linux-pci/20221114155333.234496-2-jonathanh@nvidia.com/ Sorry, it's really too late for discussion. I need to send the v6.2 pull request today or at the very latest, tomorrow, so the only thing to decide is how to resolve the merge conflict in the simplest possible way. Unless there's a very compelling reason to resolve it differently than Stephen did, that's going to be the answer. Bjorn