linux-kernel - linux-next: manual merge of the pwm tree with the usb 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:	Thu, 27 Feb 2014 15:56:13 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thierry Reding <thierry.reding@...il.com>, Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sascha Hauer <s.hauer@...gutronix.de>,
	Paul Bolle <pebolle@...cali.nl>
Subject: linux-next: manual merge of the pwm tree with the usb tree

Hi Thierry,

Today's linux-next merge of the pwm tree got a conflict in
arch/arm/Kconfig between commit f6723b569a67 ("usb: host: remove selects
of USB_ARCH_HAS_?HCI") from the usb tree and commit 557fe99d9d49 ("pwm:
Remove obsolete HAVE_PWM Kconfig symbol") from the pwm 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/Kconfig
index c85745d2d20a,cc6ce44064a2..000000000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -628,7 -629,7 +625,6 @@@ config ARCH_LPC32X
  	select CPU_ARM926T
  	select GENERIC_CLOCKEVENTS
  	select HAVE_IDE
- 	select HAVE_PWM
 -	select USB_ARCH_HAS_OHCI
  	select USE_OF
  	help
  	  Support for the NXP LPC32XX family of processors

Content of type "application/pgp-signature" skipped