Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
Date:   Tue, 24 Oct 2023 15:11:38 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Dipen Patel <dipenp@nvidia.com>,
        Bartosz Golaszewski <brgl@bgdev.pl>
Cc:     Arnd Bergmann <arnd@arndb.de>,
        Bartosz Golaszewski <bartosz.golaszewski@linaro.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the hte tree with the gpio-brgl tree
Message-ID: <20231024151138.74b045ce@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/lojYEUpnjkKC_U36m+RmUz/";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  drivers/hte/Kconfig

between commit:

  9bc633117d6a ("hte: tegra194: add GPIOLIB dependency")

from the gpio-brgl tree and commit:

  63137bee5a7a ("hte: allow building modules with COMPILE_TEST enabled")

from the hte 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 drivers/hte/Kconfig
index 8e0fd818a73e,083e67492bf2..000000000000
--- a/drivers/hte/Kconfig
+++ b/drivers/hte/Kconfig
@@@ -16,8 -16,7 +16,8 @@@ if HT
 =20
  config HTE_TEGRA194
  	tristate "NVIDIA Tegra194 HTE Support"
- 	depends on ARCH_TEGRA_194_SOC
+ 	depends on (ARCH_TEGRA_194_SOC || COMPILE_TEST)
 +	depends on GPIOLIB
  	help
  	  Enable this option for integrated hardware timestamping engine also
  	  known as generic timestamping engine (GTE) support on NVIDIA Tegra194

--Sig_/lojYEUpnjkKC_U36m+RmUz/
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmU3Q/oACgkQAVBC80lX
0GzmIwf/WO100H/5y/7Oz7WFHUnguvhiaUyG2JRJBXwBMEcG85fwWZh7koIIrkn4
n4SBBeWUCVtOZxu0n3abYWLIiUSzwpIUN24+sccg/8tqgz3rcFSBBJPpfra46iDA
uefC6THxGj+LLiGTC4NTGpRvaP0gYTfy3GOWhUFkfIy2xV16A7ZVXpgC9httbiii
TiMb+YmC86jvzPmi6T21od55MJgzVQ1HrqPxcAt87imdo7GID9/ZpZIFdOgjkLFt
LlTipZTK81qZT8WdUavUUOzEgtOkfAiy3QTi5lIDo66PcglpgF4iHh67k1fpFstb
2Ip8C9CZrzGFScFM9BukzKq6CFpeqw==
=nJpq
-----END PGP SIGNATURE-----

--Sig_/lojYEUpnjkKC_U36m+RmUz/--