Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1206527 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-08-13 08:10 +0200 |
| Last post | 2015-08-13 08:10 +0200 |
| Articles | 1 — 1 participant |
Back to article view | Back to linux.kernel
linux-next: manual merge of the clk tree with the drm-msm tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-13 08:10 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-08-13 08:10 +0200 |
| Subject | linux-next: manual merge of the clk tree with the drm-msm tree |
| Message-ID | <pWTS9-3aP-7@gated-at.bofh.it> |
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/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to top | Article view | linux.kernel
csiph-web