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:   Tue, 22 Jun 2021 18:16:24 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Bartosz Golaszewski <brgl@bgdev.pl>,
        Rob Herring <robherring2@gmail.com>
Cc:     Aswath Govindraju <a-govindraju@ti.com>,
        Bartosz Golaszewski <bgolaszewski@baylibre.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
        Rob Herring <robh@kernel.org>
Subject: linux-next: manual merge of the gpio-brgl tree with the devicetree
 tree
Message-ID: <20210622181624.57527651@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/+F/Fdewp8riCmgW67LZSuw2";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/+F/Fdewp8riCmgW67LZSuw2
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  Documentation/devicetree/bindings/gpio/gpio-davinci.txt

between commit:

  c601eef1e258 ("dt-bindings: clock: update ti,sci-clk.yaml references")

from the devicetree tree and commit:

  c830b87a761b ("dt-bindings: gpio: gpio-davinci: Convert to json-schema")

from the gpio-brgl tree.

I fixed it up (the latter removed the file, so I did that) 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_/+F/Fdewp8riCmgW67LZSuw2
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmDRnFgACgkQAVBC80lX
0Gx7Lwf/WmJvbJQ8MNkbGzphXAiIlYZGHEEPmCrdZyubBgYZkPo6uksSnmrmPbk0
4FiS9UPEgWeaV77Bnwa4uS/CcIazteaN0FzEl/eg/de3+Snkd9s0yWWgydonNIwQ
A1xfGRQfvOus8P4ze33ASlP5n6hKg+xKi/ckOXw13TqBK45OJdyab7rkhmS0kloH
0gvkDF36wYXTon0lDFEH6LBp7pYBuCpryCy6aYDXmmtE6A9HKq+OaX2mZ2YwSVuz
l2gmfMzd/0YrfmuNQ+j+rlnMQznUcokjF/0gktr5NIR2mpTyEBJKdwyouv+q1PGX
ykMook/FMy57ZA45nYC7HPTsobUyHQ==
=7+9e
-----END PGP SIGNATURE-----

--Sig_/+F/Fdewp8riCmgW67LZSuw2--