Messages in this thread | | | Subject | Re: linux-next: manual merge of the clk tree with the arm-soc tree | From | Nicolas Ferre <> | Date | Tue, 1 Mar 2016 09:38:30 +0100 |
| |
Le 01/03/2016 05:00, Stephen Rothwell a écrit : > Hi all, > > On Tue, 1 Mar 2016 14:57:00 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: >> >> Today's linux-next merge of the clk tree got a conflict in: >> >> drivers/clk/at91/clk-main.c >> >> between commit: >> >> 99a81706526f ("clk: at91: remove IRQ handling and use polling") >> >> from the arm-soc tree and commit: >> >> 8c1b1e54faed ("clk: at91: Remove impossible checks for of_clk_get_parent_count()") >> >> from the clk tree. > > And the same for drivers/clk/at91/clk-master.c
Stephen,
Both fixes seem good. Thanks!
Bye, -- Nicolas Ferre
| |