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
Date: Thu, 2 Nov 2023 11:35:58 +1100 [thread overview]
Message-ID: <20231102113558.7f70323d@canb.auug.org.au> (raw)
In-Reply-To: <20231024151138.74b045ce@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1058 bytes --]
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:
>
> 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2023-11-02 0:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-24 4:11 linux-next: manual merge of the hte tree with the gpio-brgl tree Stephen Rothwell
2023-11-02 0:35 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231102113558.7f70323d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=bartosz.golaszewski@linaro.org \
--cc=brgl@bgdev.pl \
--cc=dipenp@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).