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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20231102113558.7f70323d@canb.auug.org.au>
Date:   Thu, 2 Nov 2023 11:35:58 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Dipen Patel <dipenp@...dia.com>,
        Bartosz Golaszewski <brgl@...ev.pl>
Cc:     Arnd Bergmann <arnd@...db.de>,
        Bartosz Golaszewski <bartosz.golaszewski@...aro.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the hte tree with the gpio-brgl
 tree

Hi all,

On Tue, 24 Oct 2023 15:11:38 +1100 Stephen Rothwell <sfr@...b.auug.org.au> 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

Content of type "application/pgp-signature" skipped