linux-next: manual merge of the drm-tegra tree with the drm-misc tree

Stephen Rothwell sfr at
Thu Aug 13 19:00:29 PDT 2015

Hi Thierry,

Today's linux-next merge of the drm-tegra tree got conflicts in:


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).

Stephen Rothwell                    sfr at

More information about the dri-devel mailing list