From: Mark Brown <broonie@kernel.org>
To: Stephen Warren <swarren@nvidia.com>,
Colin Cross <ccross@android.com>, Olof Johansson <olof@lixom.net>,
Thierry Reding <treding@nvidia.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Arnd Bergmann <arnd@arndb.de>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the tegra tree with the arm-soc tree
Date: Wed, 2 Dec 2015 11:46:42 +0000 [thread overview]
Message-ID: <20151202114642.1eda69352e8d753d09e09a71@kernel.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 828 bytes --]
Hi all,
Today's linux-next merge of the tegra tree got a conflict in arch/arm64/configs/defconfig between commit e324654294907a4 ("ARM: use "depends on" for SoC configs instead of "if" after prompt") from the arm-soc tree and commit 099a6644f5be4 ("soc/tegra: Provide per-SoC Kconfig symbols") from the tegra tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
diff --cc arch/arm/mach-tegra/Kconfig
index a90f3556017f,6f7bec07cda6..000000000000
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -1,6 -1,5 +1,6 @@@
- menuconfig ARCH_TEGRA
+ config ARCH_TEGRA
- bool "NVIDIA Tegra" if ARCH_MULTI_V7
+ bool "NVIDIA Tegra"
+ depends on ARCH_MULTI_V7
select ARCH_REQUIRE_GPIOLIB
select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS
select ARM_AMBA
[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: broonie@kernel.org (Mark Brown)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the tegra tree with the arm-soc tree
Date: Wed, 2 Dec 2015 11:46:42 +0000 [thread overview]
Message-ID: <20151202114642.1eda69352e8d753d09e09a71@kernel.org> (raw)
Hi all,
Today's linux-next merge of the tegra tree got a conflict in arch/arm64/configs/defconfig between commit e324654294907a4 ("ARM: use "depends on" for SoC configs instead of "if" after prompt") from the arm-soc tree and commit 099a6644f5be4 ("soc/tegra: Provide per-SoC Kconfig symbols") from the tegra tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
diff --cc arch/arm/mach-tegra/Kconfig
index a90f3556017f,6f7bec07cda6..000000000000
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -1,6 -1,5 +1,6 @@@
- menuconfig ARCH_TEGRA
+ config ARCH_TEGRA
- bool "NVIDIA Tegra" if ARCH_MULTI_V7
+ bool "NVIDIA Tegra"
+ depends on ARCH_MULTI_V7
select ARCH_REQUIRE_GPIOLIB
select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS
select ARM_AMBA
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 473 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151202/b5c6a326/attachment.sig>
next reply other threads:[~2015-12-02 11:47 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-02 11:46 Mark Brown [this message]
2015-12-02 11:46 ` linux-next: manual merge of the tegra tree with the arm-soc tree Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2020-07-19 23:04 Stephen Rothwell
2020-07-19 23:04 ` Stephen Rothwell
2020-03-26 22:27 Stephen Rothwell
2020-03-26 22:27 ` Stephen Rothwell
2020-03-27 13:18 ` Thierry Reding
2020-03-27 13:18 ` Thierry Reding
2020-03-27 13:50 ` Arnd Bergmann
2020-03-27 13:50 ` Arnd Bergmann
2019-06-25 0:12 Stephen Rothwell
2019-06-25 0:12 ` Stephen Rothwell
2013-03-18 4:31 Stephen Rothwell
2013-03-18 4:31 ` Stephen Rothwell
2013-03-18 4:31 ` Stephen Rothwell
2013-03-18 15:23 ` Stephen Warren
2013-03-18 15:23 ` Stephen Warren
2013-03-18 15:49 ` Arnd Bergmann
2013-03-18 15:49 ` Arnd Bergmann
2013-02-02 11:52 Stephen Rothwell
2013-02-02 11:45 Stephen Rothwell
2013-01-23 5:30 Stephen Rothwell
2013-01-23 5:30 ` Stephen Rothwell
2013-01-23 5:30 ` Stephen Rothwell
2013-01-23 5:25 Stephen Rothwell
2013-01-23 5:25 ` Stephen Rothwell
2013-01-23 5:25 ` Stephen Rothwell
2013-01-16 3:14 Stephen Rothwell
2013-01-16 3:14 ` Stephen Rothwell
2013-01-16 3:14 ` Stephen Rothwell
2013-01-16 3:49 ` Tony Prisk
2013-01-16 3:49 ` Tony Prisk
2013-01-16 4:32 ` Stephen Warren
2013-01-16 4:32 ` Stephen Warren
2013-01-16 4:52 ` Tony Prisk
2013-01-16 4:52 ` Tony Prisk
2013-01-16 16:27 ` Olof Johansson
2013-01-16 16:27 ` Olof Johansson
2013-01-16 17:08 ` Stephen Warren
2013-01-16 17:08 ` Stephen Warren
2013-01-16 17:35 ` Olof Johansson
2013-01-16 17:35 ` Olof Johansson
2013-01-16 3:10 Stephen Rothwell
2013-01-16 3:10 ` Stephen Rothwell
2013-01-16 3:10 ` Stephen Rothwell
2013-01-16 3:12 ` Stephen Rothwell
2013-01-16 3:12 ` Stephen Rothwell
2013-01-16 3:12 ` Stephen Rothwell
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=20151202114642.1eda69352e8d753d09e09a71@kernel.org \
--to=broonie@kernel.org \
--cc=arnd@arndb.de \
--cc=ccross@android.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=swarren@nvidia.com \
--cc=treding@nvidia.com \
--cc=yamada.masahiro@socionext.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.