Merge branch 'for-linus' into for-next

Conflicts:
	drivers/gpu/drm/i915/intel_pm.c

diff --cc drivers/gpu/drm/drm_probe_helper.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_context.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
index 696f7543d26498611ce5028c97db75e941af60b3,62211abe492265ce33cc5e04fbfdef71de398b8f..15a9ab428553c3cf6f481917f4375b171207fffe
--- 1/drivers/gpu/drm/i915/intel_display.c
--- 2/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -6323,12 -6307,13 +6323,14 @@@ static void intel_crtc_disable_noatomic
                return;
  
        if (to_intel_plane_state(crtc->primary->state)->visible) {
 -              intel_crtc_wait_for_pending_flips(crtc);
 +              WARN_ON(intel_crtc->unpin_work);
 +
                intel_pre_disable_primary(crtc);
+ 
+               intel_crtc_disable_planes(crtc, 1 << drm_plane_index(crtc->primary));
+               to_intel_plane_state(crtc->primary->state)->visible = false;
        }
  
-       intel_crtc_disable_planes(crtc, crtc->state->plane_mask);
        dev_priv->display.crtc_disable(crtc);
        intel_crtc->active = false;
        intel_update_watermarks(crtc);

diff --cc drivers/gpu/drm/i915/intel_pm.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
Simple merge

diff --cc sound/pci/hda/hda_intel.c
Simple merge