linux-next: manual merge of the clk tree with the imx-mxs tree

Hi all, Today's linux-next merge of the clk tree got a conflict in: drivers/clk/imx/clk-imx8mn.c between commit: 0ae4fbc63c31 ("clk: imx8mn: Use common 1443X/1416X PLL clock structure") from the imx-mxs tree and commit: 727e12cde9f6 ("clk: imx: imx8mn: drop unused pll enum") from the c

Re: linux-next: manual merge of the clk tree with the imx-mxs tree

Hello Stephen, Thank you very much for this fix. BR, Bintian On 2015/5/29 18:45, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the clk tree got a conflict in drivers/clk/Makefile between commit 33156149fc4a ("ARM: imx: move clock drivers into drivers/clk") from the imx-mxs tree

linux-next: manual merge of the clk tree with the imx-mxs tree

Hi all, Today's linux-next merge of the clk tree got a conflict in drivers/clk/Makefile between commit 33156149fc4a ("ARM: imx: move clock drivers into drivers/clk") from the imx-mxs tree and commit b1691707eccd ("clk: hi6220: Clock driver support for Hisilicon hi6220 SoC") from the clk tree. I f