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" -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html