| 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: Thu, 3 Mar 2016 09:16:31 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Krzysztof Kozlowski <k.kozlowski@...sung.com>,
Tony Lindgren <tony@...mide.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Michael Turquette <mturquette@...libre.com>,
James Liao <jamesjj.liao@...iatek.com>,
Stephen Boyd <sboyd@...eaurora.org>
Subject: linux-next: manual merge of the samsung-krzk tree with the omap
tree
Hi Krzysztof,
Today's linux-next merge of the samsung-krzk tree got a conflict in:
drivers/clk/Kconfig
between commit:
21330497f303 ("clk: ti: Add support for dm814x ADPLL")
from the omap tree and commit:
b9e65ebc654d ("clk: Move vendor's Kconfig into CCF menu section")
from the samsung-krzk tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/clk/Kconfig
index 5bf16ccc010b,de707b2bfb73..000000000000
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -202,12 -202,9 +202,10 @@@ config COMMON_CLK_CDCE70
source "drivers/clk/bcm/Kconfig"
source "drivers/clk/hisilicon/Kconfig"
+ source "drivers/clk/mvebu/Kconfig"
source "drivers/clk/qcom/Kconfig"
+ source "drivers/clk/samsung/Kconfig"
+ source "drivers/clk/tegra/Kconfig"
+source "drivers/clk/ti/Kconfig"
endmenu
-
- source "drivers/clk/mvebu/Kconfig"
-
- source "drivers/clk/samsung/Kconfig"
- source "drivers/clk/tegra/Kconfig"
Powered by blists - more mailing lists