Subject: Re: linux-next: manual merge of the hte tree with the gpio-brgl tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 2 Nov 2023 11:35:58 +1100

Hi all,

On Tue, 24 Oct 2023 15:11:38 +1100 Stephen Rothwell <[email-masked]> wrote:
>
> 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.
> 
> 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
>   
>   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.

-- 
Cheers,
Stephen Rothwell