linux-kernel - linux-next: manual merge of the tip tree with the renesas 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: <20140317163106.7d1188b5a3ac41a75a060bee@canb.auug.org.au>
Date:	Mon, 17 Mar 2014 16:31:06 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	Simon Horman <horms@...ge.net.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Magnus Damm <damm@...nsource.se>,
	Daniel Lezcano <daniel.lezcano@...aro.org>,
	Wolfram Sang <wsa@...g-engineering.com>
Subject: linux-next: manual merge of the tip tree with the renesas tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/arm/mach-shmobile/Kconfig between commit 4a51856b4267 ("ARM:
shmobile: Use 64-bit dma_addr_t on r8a7790/r8a7791") from the renesas
tree and commit aeb8fb7910fc ("ARM: shmobile: Remove CMT, TMU and STI
Kconfig entries") from the tip tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/mach-shmobile/Kconfig
index 5249ff0511a8,f6db7dcae3f4..000000000000
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -116,7 -137,7 +130,8 @@@ config ARCH_R8A779
  	select MIGHT_HAVE_PCI
  	select SH_CLK_CPG
  	select RENESAS_IRQC
 +	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
+ 	select SYS_SUPPORTS_SH_CMT
  
  config ARCH_R8A7791
  	bool "R-Car M2 (R8A77910)"
@@@ -126,7 -147,7 +141,8 @@@
  	select MIGHT_HAVE_PCI
  	select SH_CLK_CPG
  	select RENESAS_IRQC
 +	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
+ 	select SYS_SUPPORTS_SH_CMT
  
  config ARCH_EMEV2
  	bool "Emma Mobile EV2"

Content of type "application/pgp-signature" skipped