linux-kernel - linux-next: manual merge of the clockevents tree with the arm 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: <20150127162454.4138ecd8@canb.auug.org.au>
Date:	Tue, 27 Jan 2015 16:24:54 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Daniel Lezcano <daniel.lezcano@...aro.org>,
	Russell King <linux@....linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Dmitry Eremin-Solenikov <dbaryshkov@...il.com>,
	Oleksij Rempel <linux@...pel-privat.de>
Subject: linux-next: manual merge of the clockevents tree with the arm tree

Hi Daniel,

Today's linux-next merge of the clockevents tree got a conflict in
drivers/clocksource/Kconfig between commit e074ff86e8b4 ("ARM: 8251/1:
clocksource: enable pxa_timer for SA-1100 platform") from the arm tree
and commit e4940cd76934 ("ARM: clocksource: add asm9260_timer driver")
from the clockevents 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 drivers/clocksource/Kconfig
index 6b6f1e4950df,4f2240c9c145..000000000000
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@@ -232,11 -236,13 +239,20 @@@ config CLKSRC_MIPS_GI
  	depends on MIPS_GIC
  	select CLKSRC_OF
  
 +config CLKSRC_PXA
 +	def_bool y if ARCH_PXA || ARCH_SA1100
 +	select CLKSRC_OF if USE_OF
 +	help
 +	  This enables OST0 support available on PXA and SA-11x0
 +	  platforms.
 +
+ config ASM9260_TIMER
+ 	bool "Alphascale ASM9260 timer driver"
+ 	select CLKSRC_MMIO
+ 	select CLKSRC_OF
+ 	default y if MACH_ASM9260
+ 	help
+ 	  This enables build of a clocksource and clockevent driver for
+ 	  the 32-bit System Timer hardware available on a Alphascale ASM9260.
+ 
  endmenu

Content of type "application/pgp-signature" skipped