Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 13 Dec 2022 10:21:03 -0600
From:   Bjorn Helgaas <helgaas@kernel.org>
To:     Vidya Sagar <vidyas@nvidia.com>, Jon Hunter <jonathanh@nvidia.com>,
        Serge Semin <Sergey.Semin@baikalelectronics.ru>
Cc:     Bjorn Helgaas <bhelgaas@google.com>,
        Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
        ARM <linux-arm-kernel@lists.infradead.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Lorenzo Pieralisi <lpieralisi@kernel.org>,
        Thierry Reding <treding@nvidia.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Rob Herring <robh@kernel.org>
Subject: Re: linux-next: manual merge of the pci tree with the arm-soc tree
Message-ID: <20221213162103.GA106222@bhelgaas>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20221205095738.607b9551@canb.auug.org.au>
Precedence: bulk

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?