Merge tag 'v4.2-rc7' into drm-next

Linux 4.2-rc7

Backmerge master for i915 fixes

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
Simple merge

diff --cc drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
Simple merge

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

diff --cc drivers/gpu/drm/drm_crtc.c
index 21f1f5ce2d6006657051a418b9cb756c5307b350,fed748311b928cc534f781505a37686ec7a46ba3..33d877c65ced6a3c138af9ab47c824038410be0b
--- 1/drivers/gpu/drm/drm_crtc.c
--- 2/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@@ -5273,14 -5398,9 +5273,11 @@@ void drm_mode_config_reset(struct drm_d
                if (encoder->funcs->reset)
                        encoder->funcs->reset(encoder);
  
 -      list_for_each_entry(connector, &dev->mode_config.connector_list, head)
 +      mutex_lock(&dev->mode_config.mutex);
-       drm_for_each_connector(connector, dev) {
-               connector->status = connector_status_unknown;
- 
++      drm_for_each_connector(connector, dev)
                if (connector->funcs->reset)
                        connector->funcs->reset(connector);
-       }
 +      mutex_unlock(&dev->mode_config.mutex);
  }
  EXPORT_SYMBOL(drm_mode_config_reset);
  

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

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

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

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

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

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

diff --cc drivers/gpu/drm/nouveau/nouveau_drm.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_ttm.c
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc include/drm/drmP.h
Simple merge

diff --cc include/drm/drm_crtc_helper.h
Simple merge

diff --cc include/uapi/drm/i915_drm.h
Simple merge