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 D5D7CC4332F for ; Tue, 13 Dec 2022 20:08:38 +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: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:References: List-Owner; bh=zPF4jEnhO7Ia+bZYCoo5l8G3dodo7lvC4FFyVD/tjnw=; b=wvK7dcHFvz/f+3 ybVnN60xd58BsfwStC0KilUpw8AkHccZvYjlBgAZ/ykdPG4t2ReNWWOKlQeUXS8yrIKA6969Y4n7j qfh3L4csVrXm7KTEWWfO1XfRjEifJIFgJKuh0LLjt6fpuAKdklfEwdOeqU54/H9lDo32K+EQ+H3k7 w9qlJwXWs+oWapcJLkiTGKKgbA9ALOOmyyEJfGF/jb+JmgQ8OQjgKhY9tzEfr5BhvjINdRrR24AW+ 9I95lDR5JUQ/rgz6q3JBXo7IPX0EnyNEzK+dumEmrc3KaUepc1tIt6w5Ha5qXEq6w4x3ON8TbE4f2 d8/7sUFtsRwDmjTCu9/w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p5BZ0-005fqt-Ai; Tue, 13 Dec 2022 20:07:42 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p5BYw-005fhW-KY for linux-arm-kernel@lists.infradead.org; Tue, 13 Dec 2022 20:07:40 +0000 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 ams.source.kernel.org (Postfix) with ESMTPS id 22683B811FF; Tue, 13 Dec 2022 20:07:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E063C433EF; Tue, 13 Dec 2022 20:07:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670962055; bh=GYYlwzxQ3UCGDe4WcOmFtXm8+K3DpY1ve1L3XVCcVmU=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=KofgOd1F40PH4rNxNB0DqLPpABTiEpu0ZdQZ0akIFU8PBSgL3kPKuUnREhGzShzOk FQwMU4YkKA2TvR4n/jIe3pvx/HJ/8ZRVqfuvdhLAHCUBcHELvXNzUKjfHM0H8IUZh4 e/jT0oU0+NDN2xcx3k7cUBz9z5VLF+DZ9cmaP4RM2Idw9PY3/MjNwad4YucEnp9de+ +48UKgpJEsTXQ6ElCMOmcZx9u5WAzJS6Fb1uJ6JGCBHjZH2tOpfoMOZwdu+DKKrPTk 9aY1pJj2bhTEpBEZV+ZauufRAStYboO9PUduehSn3xb6WqxOuLXVNMoXOVnDYZs5DF cvtWPVNOvpfiQ== Date: Tue, 13 Dec 2022 14:07:33 -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: <20221213200733.GA201693@bhelgaas> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20221213195313.GA200257@bhelgaas> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221213_120738_991264_1D7D7D9B X-CRM114-Status: GOOD ( 29.85 ) 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 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. 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 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