linux-kernel - linux-next: manual merge of the tegra tree with the arm-soc 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>] [day] [month] [year] [list]

Message-Id: <20151202114642.1eda69352e8d753d09e09a71@kernel.org>
Date:	Wed, 2 Dec 2015 11:46:42 +0000
From:	Mark Brown <broonie@...nel.org>
To:	Stephen Warren <swarren@...dia.com>,
	Colin Cross <ccross@...roid.com>,
	Olof Johansson <olof@...om.net>,
	Thierry Reding <treding@...dia.com>,
	Masahiro Yamada <yamada.masahiro@...ionext.com>,
	Arnd Bergmann <arnd@...db.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	linux-arm-kernel@...ts.infradead.org
Subject: linux-next: manual merge of the tegra tree with the arm-soc tree

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

Content of type "application/pgp-signature" skipped