linux-kernel - linux-next: manual merge of the usb tree with the tip 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 17 Mar 2014 18:31:26 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Paul Bolle <pebolle@...cali.nl>,
	Magnus Damm <damm@...nsource.se>,
	Daniel Lezcano <daniel.lezcano@...aro.org>,
	Wolfram Sang <wsa@...g-engineering.com>
Subject: linux-next: manual merge of the usb tree with the tip tree

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-shmobile/Kconfig between commit aeb8fb7910fc ("ARM:
shmobile: Remove CMT, TMU and STI Kconfig entries") from the tip tree and
commit f6723b569a67 ("usb: host: remove selects of USB_ARCH_HAS_?HCI")
from the usb 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 9f68d2aa2a12,a06590237209..000000000000
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -107,9 -102,6 +107,7 @@@ config ARCH_R8A777
  	select CPU_V7
  	select SH_CLK_CPG
  	select ARM_GIC
- 	select USB_ARCH_HAS_EHCI
- 	select USB_ARCH_HAS_OHCI
 +	select SYS_SUPPORTS_SH_TMU
  
  config ARCH_R8A7779
  	bool "R-Car H1 (R8A77790)"
@@@ -117,10 -109,7 +115,8 @@@
  	select ARM_GIC
  	select CPU_V7
  	select SH_CLK_CPG
- 	select USB_ARCH_HAS_EHCI
- 	select USB_ARCH_HAS_OHCI
  	select RENESAS_INTC_IRQPIN
 +	select SYS_SUPPORTS_SH_TMU
  
  config ARCH_R8A7790
  	bool "R-Car H2 (R8A77900)"

Content of type "application/pgp-signature" skipped