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:   Thu, 21 Jan 2021 13:26:45 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Rob Herring <robherring2@gmail.com>,
        David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Cc:     Grygorii Strashko <grygorii.strashko@ti.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Rob Herring <robh@kernel.org>
Subject: linux-next: manual merge of the devicetree tree with the net-next
 tree
Message-ID: <20210121132645.0a9edc15@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/4Mltm=817k1qngRGqT7LIAG";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/4Mltm=817k1qngRGqT7LIAG
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/net/ti,k3-am654-cpsw-nuss.yaml

between commit:

  19d9a846d9fc ("dt-binding: net: ti: k3-am654-cpsw-nuss: update bindings f=
or am64x cpsw3g")

from the net-next tree and commit:

  0499220d6dad ("dt-bindings: Add missing array size constraints")

from the devicetree tree.

I fixed it up (see below) 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

diff --cc Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
index 3fae9a5f0c6a,097c5cc6c853..000000000000
--- a/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
+++ b/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
@@@ -72,7 -66,8 +72,8 @@@ properties
    dma-coherent: true
 =20
    clocks:
+     maxItems: 1
 -    description: CPSW2G NUSS functional clock
 +    description: CPSWxG NUSS functional clock
 =20
    clock-names:
      items:

--Sig_/4Mltm=817k1qngRGqT7LIAG
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmAI5mUACgkQAVBC80lX
0GytuwgAjhKNzn/qra4GuNZvh50dYrJ+NpEzKxx1r3Dy0OWlM3yHOHW2oIHrhVni
EkIGgwybxYV44kcQKUzCDDpHG+SvFYkOI4sq4zFxHXqFkUVDdbH72X/ptc1TycPa
uRzqH+krnkrDM+KCm2plwkd6ZEbAr90kiRQWGITKJm82gweCAWCQO2TXa2yRa5ef
WM/EhuzvqCboEMk/VVhskgcCycUhVEW3PKetDLQS/GGTycgCJCwUQtVNmIeRdJJD
wsYPMghPVk9xRF8DYn8Br3YnyEYk83iTKD2bN0DBTcGJjGCbxFOhNSgVsq0TtM3+
Z8aQXG3opmWMLW04kqagsB2kE7oQxA==
=Uoaj
-----END PGP SIGNATURE-----

--Sig_/4Mltm=817k1qngRGqT7LIAG--