linux-kernel - linux-next: manual merge of the omap 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: <20101227094156.5750aa6e.sfr@canb.auug.org.au>
Date:	Mon, 27 Dec 2010 09:41:56 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tony Lindgren <tony@...mide.com>, <linux-omap@...r.kernel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Jean-Christop PLAGNIOL-VILLARD" <plagnioj@...osoft.com>,
	Russell King <rmk@....linux.org.uk>,
	Ben Gamari <bgamari.foss@...il.com>
Subject: linux-next: manual merge of the omap tree with the arm tree

Hi all,

Today's linux-next merge of the omap tree got a conflict in
arch/arm/plat-omap/Kconfig between commit
6d803ba736abb5e122dede70a4720e4843dd6df4 ("ARM: 6483/1: arm & sh:
factorised duplicated clkdev.c") from the arm tree and commit
dc69d1af9e8d9cbbabff88bb35a6782187a22229 ("omap2: Make OMAP2PLUS select
OMAP_DM_TIMER") from the omap tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/plat-omap/Kconfig
index c940843,bc0c7aa..0000000
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@@ -17,7 -17,8 +17,8 @@@ config ARCH_OMAP
  
  config ARCH_OMAP2PLUS
  	bool "TI OMAP2/3/4"
 -	select COMMON_CLKDEV
 +	select CLKDEV_LOOKUP
+ 	select OMAP_DM_TIMER
  	help
  	  "Systems based on OMAP2, OMAP3 or OMAP4"
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/