* linux-next: manual merge of the clk tree with the sunxi tree
@ 2016-03-01 4:07 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2016-03-01 4:07 UTC (permalink / raw)
To: Mike Turquette, Stephen Boyd, Maxime Ripard
Cc: linux-next, linux-kernel, Chen-Yu Tsai
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-03-01 4:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-01 4:07 linux-next: manual merge of the clk tree with the sunxi tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).