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, 28 Jan 2021 17:03:31 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Bartosz Golaszewski <brgl@bgdev.pl>,
        Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
        ARM <linux-arm-kernel@lists.infradead.org>
Cc:     Bartosz Golaszewski <bgolaszewski@baylibre.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
Subject: linux-next: manual merge of the gpio-brgl tree with the arm-soc
 tree
Message-ID: <20210128170331.4f2ac87b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/MVycaLEgYb5eMOse.wqg9Yv";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/MVycaLEgYb5eMOse.wqg9Yv
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:

  arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts

between commit:

  4fd18fc38757 ("arm64: dts: visconti: Add watchdog support for TMPV7708 So=
C")

from the arm-soc tree and commit:

  08bc3941b6a4 ("arm: dts: visconti: Add DT support for Toshiba Visconti5 G=
PIO driver")

from the gpio-brgl 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 arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
index 37da418393e0,950010a290f0..000000000000
--- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
+++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
@@@ -42,7 -42,6 +42,11 @@@
  	clock-names =3D "apb_pclk";
  };
 =20
 +&wdt {
 +	status =3D "okay";
 +	clocks =3D <&wdt_clk>;
 +};
++
+ &gpio {
+ 	status =3D "okay";
+ };

--Sig_/MVycaLEgYb5eMOse.wqg9Yv
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmASU7MACgkQAVBC80lX
0GyHRgf+PxzTZwdzbhhLHVFIuTL/GAZZelHBnqy5oZ/Le/41mQmFOaHG6VDubIOv
E61/MqfdonL237Uki3sTUrWMMa1SCxzDO5dsazJeO/zEBIltwac0WCZm2TV+USSw
59Cfqfv3vm97e/gMCNsUnS8YDE0Mq2PHutiGMkka/jnH+/3VMTnBVtyUJFXuiUva
rGGX89OhITXGUSDAahzIocFDVF4IwvYdY5f3HsXO+LDTxtGHvw4i8pgLCupbQP/R
Xc3tmObyawj1cEYl5zFzkRtbz77NzpuLJnVPvNmep2DlYeMIQmKdUZeZfNld9ue/
HETv5oief/ny2A9ttxIKWjf07FydMQ==
=ksyq
-----END PGP SIGNATURE-----

--Sig_/MVycaLEgYb5eMOse.wqg9Yv--