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 1383BC4167B for ; Tue, 13 Dec 2022 16:22:13 +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=7bS4SvxX5iXpYC5d9KkjIVQy2c1fB92u58zezkEpvV0=; b=4q7Ea+J9M83xgR 9cKO3VqOldU4zSQ71YtbddcaKmYFOUyZqJ2USb2oBtKm/XSpzjKMrXsibxxxeD/g+tCMaQGIHu7oY U7WZpN3Pq0Cac7Uzp2gzs++CA8P+CsNIAYqttEfKrD01FpeTbeyljpvJfo65BiFO4R/91BKcxWuf5 CoFki2IWWkaFFx5RE+9LD20NU4wsc7BViVERbpN2x36OmFHwhFm4V7ZcAXnT5FivoC18OW1YCP21r KT80TsQIto5pd5RmhBwJk3muRpkaYLapWxxtkmqR9Zxjq3017IqnKzKLREzY1ruUVtG/PHxExMjkl CgY1Xi/p+rNDG9NyfBUA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p581q-002ncB-A8; Tue, 13 Dec 2022 16:21:14 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p581k-002nZv-Oy for linux-arm-kernel@lists.infradead.org; Tue, 13 Dec 2022 16:21:13 +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 65B9DB81235; Tue, 13 Dec 2022 16:21:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF33AC433D2; Tue, 13 Dec 2022 16:21:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670948465; bh=vx8f5XR4baTM163oHf4/eakdYDybX0oqWobDFJ/wI3g=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=PwFu4Xs1dGbQByk5cjonAVIpHbsUBVXXaIyeZPKH83B/2ZK0yM0JRrFQBJad6iPQv Zztx7SvogOavIoidFov1eSrdAcNokBvFVsZmZXt1z0Frv4R33KnkOyVDqZAEdyyTAk JGUZDD7texANoARzyl4evjWR4IEiFcDbB+43OAacfChtid6uJs3vFFzOmDmi4OeIR0 yMIekbOtUySC/oUtw3R/p1stEt3WmH7TnRzobZfQIGUAzO2vOFFvUof7X6Nm91CsNN xgGtFCDjRAjTAEu2Asw8tODss5ggXbv4EX5PSWiDNXA9I8jLlkBE6Kyni/Ls3Hvozq 6gL1NB/vaf09A== Date: Tue, 13 Dec 2022 10:21:03 -0600 From: Bjorn Helgaas To: Vidya Sagar , Jon Hunter , Serge Semin Cc: Bjorn Helgaas , Olof Johansson , Arnd Bergmann , ARM , Linux Kernel Mailing List , Linux Next Mailing List , Lorenzo Pieralisi , Thierry Reding , Stephen Rothwell , Rob Herring 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-Disposition: inline In-Reply-To: <20221205095738.607b9551@canb.auug.org.au> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221213_082109_000021_F7497BE6 X-CRM114-Status: GOOD ( 15.51 ) 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 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? _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel