linux-kernel - linux-next: manual merge of the renesas 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>] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 2 Dec 2015 11:21:09 +0000
From:	Mark Brown <broonie@...nel.org>
To:	Simon Horman <horms@...ge.net.au>,
	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 renesas tree with the arm-soc tree

Hi Simon,

Today's linux-next merge of the renesas tree got a conflict in
arch/arm/mach-shmobile/Kconfig between commit e32465429490 ("ARM: use "depends
on" for SoC configs instead of "if" after prompt") from the arm-soc tree and
commit 9b5ba0df4ea4f94 ("ARM: shmobile: Introduce ARCH_RENESAS") from the
renesas tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

diff --cc arch/arm/mach-shmobile/Kconfig
index 0f25f8fa2692,4ed72b124235..000000000000
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -29,10 -31,11 +31,11 @@@ config ARCH_RMOBIL
        select SYS_SUPPORTS_SH_CMT
        select SYS_SUPPORTS_SH_TMU
  
- menuconfig ARCH_SHMOBILE_MULTI
+ menuconfig ARCH_RENESAS
 -      bool "Renesas ARM SoCs" if ARCH_MULTI_V7
 -      depends on MMU
 +      bool "Renesas ARM SoCs"
 +      depends on ARCH_MULTI_V7 && MMU
        select ARCH_SHMOBILE
+       select ARCH_SHMOBILE_MULTI
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
        select ARM_GIC

Content of type "application/pgp-signature" skipped