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

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