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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2383DC4332F for ; Tue, 13 Dec 2022 23:38:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:CC:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=D3XB6+6gUhRdnSaoGBIE49pDauTuE1THehGqkiZCZZI=; b=rKxAKOFK5Baw5p fXEkwT6CtrcHwHo/+Pfatci4ppZyAcAaMG/XIzPZ6AWLlEiTsv2+S7tZ1FCRP3kFNRvqmr5aXEcWk g/N3FzMhAn+yL+ZBbR7UyMNEHEkQtYHhH2UxDeNjjAELI3MSIRumm/CzxJUCvvzrMnZmBuc2wCBnU eqiXYTAfHmbiLEBMBJOq5GLaLLW57QEopvATAsmVzhxaG0j4ssEvGv5+XPOSwpWy800m/VphAy+8b 6yvQgOLcK97FtBRjXD3URD4oqEaWPNcSchuy5vvxSL71pSZir8Uo/L96PUWpQldLTIxcWhhjYsOD8 HjxAVTue2ObzWF4KDw3g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p5Epo-0089ig-8g; Tue, 13 Dec 2022 23:37:16 +0000 Received: from post.baikalelectronics.com ([213.79.110.86]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p5Epi-0089fz-PP for linux-arm-kernel@lists.infradead.org; Tue, 13 Dec 2022 23:37:14 +0000 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-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) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221213_153712_186455_304A4AB0 X-CRM114-Status: GOOD ( 32.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel