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:   Mon, 5 Dec 2022 09:57:38 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Bjorn Helgaas <bhelgaas@google.com>,
        Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>
Cc:     ARM <linux-arm-kernel@lists.infradead.org>,
        Jon Hunter <jonathanh@nvidia.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Lorenzo Pieralisi <lpieralisi@kernel.org>,
        Serge Semin <Sergey.Semin@baikalelectronics.ru>,
        Thierry Reding <treding@nvidia.com>,
        Vidya Sagar <vidyas@nvidia.com>
Subject: linux-next: manual merge of the pci tree with the arm-soc tree
Message-ID: <20221205095738.607b9551@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/wV==IJ36Bzw3DIqig+HF4rM";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/wV==IJ36Bzw3DIqig+HF4rM
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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").

--=20
Cheers,
Stephen Rothwell

--Sig_/wV==IJ36Bzw3DIqig+HF4rM
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmONJeIACgkQAVBC80lX
0GzWJwgAg3BG3dPKwiYyWDTU7i9vg+7PqA+23Qi7+tQTPxRGmUoMgk2CMmcyQWBn
U4f+0eUOuwkXwEkIAplqnLnYoDBY4ELgybevgjZBArVWdCxAWTbAHEB20nIgvDin
W49tsV2K6aG0nxV12BQkZ65441CogKFci934bDa9Mv5z4TZGAZxbxMavWsEq+0rn
dsbKmtyUeBlDDUHZR8MQLcGCw9WeBPHjBW3xvj+0VbhoVbe0LD/wBn/DCmiDOIfU
ukxxmhdtyCU/f3xMO+TKvbnO+/Vwu4ZshVsRRStRXX2LigMA0Gvs87E8U3kK2Thy
ZKllvGxaSyWN29MFe3xvBgbvBv3WPA==
=LVF7
-----END PGP SIGNATURE-----

--Sig_/wV==IJ36Bzw3DIqig+HF4rM--