$ 0 0 Hi all, Today's linux-next merge of the clk tree got a conflict in: drivers/clk/Kconfig drivers/clk/samsung/Kconfig between commit: fa643954