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 83964C4332F for ; Tue, 13 Dec 2022 23:37:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234027AbiLMXhO (ORCPT ); Tue, 13 Dec 2022 18:37:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236514AbiLMXhD (ORCPT ); Tue, 13 Dec 2022 18:37:03 -0500 Received: from post.baikalelectronics.com (post.baikalelectronics.com [213.79.110.86]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 40A292ED; Tue, 13 Dec 2022 15:36:59 -0800 (PST) Received: from post.baikalelectronics.com (localhost.localdomain [127.0.0.1]) by post.baikalelectronics.com (Proxmox) with ESMTP id EA808E0EF3; Wed, 14 Dec 2022 02:36:57 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= baikalelectronics.ru; h=cc:cc:content-type:content-type:date :from:from:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=post; bh=eBpFStnJo5vywfTywan9 sXxiTpddI4vii6gPlA8SHjo=; b=rR7tGQiadPIkYXV+K1vHPD+7LxZeRDf3zsJy Gy7anDLi8y1+Z0vepqspygcZjYDy4OrcuShgQCjUVv6LQrJKBjhN6+amEQkhXP1I hDpYsxMYnWAhHTVViLg4+Cwp7+ZQK++PIyR613zelL8F0tZjNOMWm5tWkUhykVh2 Xa+KR/Q= Received: from mail.baikal.int (mail.baikal.int [192.168.51.25]) by post.baikalelectronics.com (Proxmox) with ESMTP id D0B9CE0EBF; Wed, 14 Dec 2022 02:36:57 +0300 (MSK) Received: from mobilestation (10.8.30.6) by mail (192.168.51.25) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 14 Dec 2022 02:36:57 +0300 Date: Wed, 14 Dec 2022 02:36:49 +0300 From: Serge Semin To: Bjorn Helgaas 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: <20221213233649.zmmiskezdponleuc@mobilestation> References: <20221213195313.GA200257@bhelgaas> <20221213200733.GA201693@bhelgaas> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20221213200733.GA201693@bhelgaas> X-Originating-IP: [10.8.30.6] X-ClientProxiedBy: MAIL.baikal.int (192.168.51.25) To mail (192.168.51.25) Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Tue, Dec 13, 2022 at 02:07:33PM -0600, Bjorn Helgaas wrote: > On Tue, Dec 13, 2022 at 01:53:13PM -0600, Bjorn Helgaas wrote: > > 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. > > > > > > 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. Sigh... One more redundant vendor-specific name. I wish I was in the Cc-list of the original series. > > To be more specific, the current answer is this (which is the same as > what's in next-20221213): > > https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/tree/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml?id=f64171fdd171 Thanks. I've got it from the @Stephen message. @Thierry will submit a new patch with the same 'ecam'-names change rebased on top of the updated DT-schema. -Serge(y) > > If you think it needs to be different, please respond with a patch and > explanation. > > Bjorn >