lkml.org 
[lkml]   [2016]   [Feb]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the clk tree with the sunxi tree
Hi all,

Today's linux-next merge of the clk tree got a conflict in:

drivers/clk/sunxi/clk-sun6i-ar100.c

between commit:

3ca2377b6fed ("clk: sunxi: rewrite sun6i-ar100 using factors clk")

from the sunxi tree and commit:

36bf2811416c ("clk: sunxi: Use proper type for of_clk_get_parent_count() return value")

from the clk tree.

I fixed it up (the former removed the code updated by the latter) and
can carry the fix as necessary (no action is required).

--
Cheers,
Stephen Rothwell

\
 
 \ /
  Last update: 2016-03-01 05:41    [W:0.037 / U:0.112 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site