linux-kernel - linux-next: manual merge of the char-misc 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:	Fri, 21 Nov 2014 17:24:12 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Mathieu Poirier <mathieu.poirier@...aro.org>,
	Tony Lindgren <tony@...mide.com>
Subject: linux-next: manual merge of the char-misc tree with the arm-soc
 tree

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in
arch/arm/mach-omap2/Kconfig between commit 9e1e632c4846 ("ARM: OMAP2+:
Drop board file for ti8168evm") from the arm-soc tree and commit
184901a06a36 ("ARM: removing support for etb/etm in
"arch/arm/kernel/"") from the char-misc 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-omap2/Kconfig
index 27ec8923ddf6,06020fe77e57..000000000000
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@@ -276,14 -282,16 +276,6 @@@ config MACH_SBC353
  	default y
  	select OMAP_PACKAGE_CUS
  
- config OMAP3_EMU
- 	bool "OMAP3 debugging peripherals"
- 	depends on ARCH_OMAP3
- 	select ARM_AMBA
- 	select OC_ETM
- 	help
- 	  Say Y here to enable debugging hardware of omap3
 -config MACH_TI8168EVM
 -	bool "TI8168 Evaluation Module"
 -	depends on SOC_TI81XX
 -	default y
 -
 -config MACH_TI8148EVM
 -	bool "TI8148 Evaluation Module"
 -	depends on SOC_TI81XX
 -	default y
--
  config OMAP3_SDRC_AC_TIMING
  	bool "Enable SDRC AC timing register changes"
  	depends on ARCH_OMAP3

Content of type "application/pgp-signature" skipped