Merge Linus master into drm-next

The merge is clean, but the arm build fails afterwards,
due to API changes in the regulator tree.

I've included the patch into the merge to fix the build.

Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 3403edea9076..3007b44e6bf4 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -2135,7 +2135,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
         connector = drm_connector_find(dev, out_resp->connector_id);
         if (!connector) {
                 ret = -ENOENT;
-                goto out;
+                goto out_unlock;
         }
 
         for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++)
@@ -2215,6 +2215,8 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
 
 out:
         drm_modeset_unlock(&dev->mode_config.connection_mutex);
+
+out_unlock:
         mutex_unlock(&dev->mode_config.mutex);
 
         return ret;