Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 29 Oct 2021 13:24:11 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Rob Herring <robherring2@gmail.com>,
        Bjorn Helgaas <bhelgaas@google.com>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
        Rob Herring <robh@kernel.org>, Simon Xue <xxm@rock-chips.com>
Subject: linux-next: manual merge of the devicetree tree with the pci tree
Message-ID: <20211029132411.1bd856b0@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/ikHRF/MsMWN=15cz=EvX1EZ";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/ikHRF/MsMWN=15cz=EvX1EZ
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the devicetree tree got a conflict in:

  Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml

between commit:

  af7cda832f8a ("dt-bindings: rockchip: Add DesignWare based PCIe controlle=
r")

from the pci tree and commit:

  ad854f362e8c ("dt-bindings: rockchip: Add DesignWare based PCIe controlle=
r")

from the devicetree tree.

These were almost identical patches.  I went with the former one sonce
it was dated later.

I fixed it up (see above) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--=20
Cheers,
Stephen Rothwell

--Sig_/ikHRF/MsMWN=15cz=EvX1EZ
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmF7W0sACgkQAVBC80lX
0GwjzQf/Z5idPOhLCy+Aa5cr4oIhHUC3GdiGRXoBCWVOqq8dQeMsWK3g5SHlfhrZ
Ut9T0xTNVDA8tHjTEPlJm4n9/NotUpcXe43GPgSdu1BNHX8cANrsMw/TIocA6ILN
P1faWJ4KeeCwlKTd2qLYhIZBYVHEp2/nsJ3RFp4e70s6GawAgfiqoxdlC5ckH2NW
k9d6JonuodiLkLJDgai0wuIbfAcHVxdluLXamwEMUH7yoSCCFlo12zXoYw99I37E
PdSR6aXn3OUuou21RzThGA8VfH9f0mK6mZKmRqPALOzJyy3KenYuZTjH4wgkTBVl
jiZhjz7hqhYilEs8hvOmyM5anZ9a/g==
=c8hV
-----END PGP SIGNATURE-----

--Sig_/ikHRF/MsMWN=15cz=EvX1EZ--