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 s...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
