| 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
| ||
|
Date: Mon, 14 May 2012 19:24:04 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Mike Turquette <mturquette@...aro.org>,
Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
<linux-arm-kernel@...ts.infradead.org>,
Viresh Kumar <viresh.kumar@...com>
Subject: linux-next: manual merge of the akpm tree with the arm-soc tree
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
drivers/clk/Kconfig between commit d269b974e32c ("clk: remove
COMMON_CLK_DISABLE_UNUSED") from the arm-soc tree and commit "clk: remove
redundant depends on from drivers/Kconfig" from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc drivers/clk/Kconfig
index 4864407,4f10a21..0000000
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -23,9 -22,18 +23,8 @@@ config COMMON_CL
menu "Common Clock Framework"
depends on COMMON_CLK
-config COMMON_CLK_DISABLE_UNUSED
- bool "Disabled unused clocks at boot"
- ---help---
- Traverses the entire clock tree and disables any clocks that are
- enabled in hardware but have not been enabled by any device drivers.
- This saves power and keeps the software model of the clock in line
- with reality.
-
- If in doubt, say "N".
-
config COMMON_CLK_DEBUG
bool "DebugFS representation of clock tree"
- depends on COMMON_CLK
select DEBUG_FS
---help---
Creates a directory hierchy in debugfs for visualizing the clk
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists