* linux-next: manual merge of the clk tree with the drm-msm tree
@ 2015-08-13 6:00 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-08-13 6:00 UTC (permalink / raw)
To: Mike Turquette, Stephen Boyd, Rob Clark; +Cc: linux-next, linux-kernel, Hai Li
Hi all,
Today's linux-next merge of the clk tree got a conflict in:
drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c
between commit:
bdbc06e2309b ("drm/msm/dsi: Save/Restore PLL status across PHY reset")
from the drm-msm tree and commit:
3dde2c2b968a ("drm/msm/dsi: Convert to clk_hw based provider APIs")
from the clk tree.
I fixed it up (the former removed some of the code updated by the latter)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-08-13 6:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-13 6:00 linux-next: manual merge of the clk tree with the drm-msm 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).