Re: linux-next: manual merge of the clk tree with the samsung-krzk tree

On 16.02.2016 13:11, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the clk tree got a conflict in: > > drivers/clk/Kconfig > drivers/clk/samsung/Kconfig > > between commit: > > fa6439544887 ("clk: samsung: Enable COMPILE_TEST for Samsung clocks") > > from the samsung-

linux-next: manual merge of the clk tree with the samsung-krzk tree

Hi all, Today's linux-next merge of the clk tree got a conflict in: drivers/clk/Kconfig drivers/clk/samsung/Kconfig between commit: fa6439544887 ("clk: samsung: Enable COMPILE_TEST for Samsung clocks") from the samsung-krzk tree and commit: b9e65ebc654d ("clk: Move vendor's Kconfig in