* linux-next: manual merge of the drm-tegra tree with the drm-misc tree
@ 2015-08-14 2:00 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-08-14 2:00 UTC (permalink / raw)
To: Thierry Reding, Daniel Vetter, intel-gfx, dri-devel
Cc: linux-next, linux-kernel
Hi Thierry,
Today's linux-next merge of the drm-tegra tree got conflicts in:
drivers/gpu/drm/tegra/dsi.c
drivers/gpu/drm/tegra/hdmi.c
drivers/gpu/drm/tegra/rgb.c
drivers/gpu/drm/tegra/sor.c
between commit:
9a69a9ac20f7 ("drm: Make the connector dpms callback return a value, v2")
from the drm-misc tree and commits:
171e2e6dd912 ("drm/tegra: dsi: Restore DPMS")
29871b21c48c ("drm/tegra: hdmi: Restore DPMS")
32c3dee11e8e ("drm/tegra: rgb: Restore DPMS")
850bab448034 ("drm/tegra: sor: Restore DPMS")
from the drm-tegra tree.
I fixed it up (the latter commits removed the code updated by the former)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-08-14 2:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-14 2:00 linux-next: manual merge of the drm-tegra tree with the drm-misc 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).