Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32;
Date:   Thu, 2 Nov 2023 11:35:58 +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: Re: linux-next: manual merge of the hte tree with the gpio-brgl
 tree
Message-ID: <20231102113558.7f70323d@canb.auug.org.au>
In-Reply-To: <20231024151138.74b045ce@canb.auug.org.au>
References: <20231024151138.74b045ce@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/CuJq0SZXgVK89hE4tl+DR/l";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/CuJq0SZXgVK89hE4tl+DR/l
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Tue, 24 Oct 2023 15:11:38 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the hte tree got a conflict in:
>=20
>   drivers/hte/Kconfig
>=20
> between commit:
>=20
>   9bc633117d6a ("hte: tegra194: add GPIOLIB dependency")
>=20
> from the gpio-brgl tree and commit:
>=20
>   63137bee5a7a ("hte: allow building modules with COMPILE_TEST enabled")
>=20
> from the hte tree.
>=20
> 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

This is now a conflict between the hte tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/CuJq0SZXgVK89hE4tl+DR/l
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVC7u8ACgkQAVBC80lX
0GwwkQgAhr+AC7KGLdiBAzPcWcQmH929+NI0My+54gvGplsOjT6Xpd9uorD+k4bm
hPUNNWuGzsi0+EvuFexAld7cxUydrvMzVBQueJ/+JR43sTCyKTUscAeCV7BW8zT8
Kv8qGxO40fxNVHMvnWij3eLt0NKI/gayEJK9+5GTHALUR/eFJNI1OxToOcHpzcsD
3JpHrouA9NCZPNlDiglsNp9ZHl5FRSinnhgIGr4FU8Ujh2ugg8pP7pWXOUwZVz9/
bBhKKnb41yfslOZ0kl6/3DkmbtMudZfXnOBMdLxhb8p1J2WoaeVcMRefWc6CjLO1
sd+OyzWtv9ZfN5HItZRJyuLDQCRjIw==
=ZNDj
-----END PGP SIGNATURE-----

--Sig_/CuJq0SZXgVK89hE4tl+DR/l--