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  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]
Date:	Mon, 24 Mar 2014 16:35:18 +1100
From:	Stephen Rothwell <>
To:	Thierry Reding <>,
	Olof Johansson <>, Arnd Bergmann <>,
	Sascha Hauer <>
Subject: linux-next: manual merge of the pwm tree with the arm-soc tree

Hi Thierry,

Today's linux-next merge of the pwm tree got a conflict in
arch/arm/mach-pxa/Kconfig between commit c7dc7d49fa8c ("ARM: pxa: select
I2C_GPIO only if I2C is on") from the arm-soc tree and commit
557fe99d9d49 ("pwm: Remove obsolete HAVE_PWM Kconfig symbol") from the
pwm tree.

I fixed it up (the former also remove the select of HAVE_PWM) and can
carry the fix as necessary (no action is required).

Stephen Rothwell          

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists