BackMerge tag 'v4.11-rc3' into drm-next

Linux 4.11-rc3 as requested by Daniel

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/arm/malidp_crtc.c
Simple merge

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

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

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

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

diff --cc drivers/gpu/drm/mxsfb/mxsfb_drv.c
Simple merge

diff --cc drivers/gpu/drm/tilcdc/tilcdc_crtc.c
Simple merge

diff --cc drivers/i2c/busses/i2c-designware-core.h
Simple merge

diff --cc drivers/i2c/busses/i2c-designware-platdrv.c
index df0ff7d82b497cdaf2073734b00930d541cfd30b,79c4b4ea053969e46226dc749fb12a5b59c3ac2c..d8665098dce9d0536b0fcb957bea01e590008ece
--- 1/drivers/i2c/busses/i2c-designware-platdrv.c
--- 2/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@@ -235,12 -244,13 +244,13 @@@ static int dw_i2c_plat_probe(struct pla
            && dev->clk_freq != 1000000 && dev->clk_freq != 3400000) {
                dev_err(&pdev->dev,
                        "Only 100kHz, 400kHz, 1MHz and 3.4MHz supported");
-               return -EINVAL;
+               r = -EINVAL;
+               goto exit_reset;
        }
  
 -      r = i2c_dw_eval_lock_support(dev);
 +      r = i2c_dw_probe_lock_support(dev);
        if (r)
-               return r;
+               goto exit_reset;
  
        dev->functionality = I2C_FUNC_10BIT_ADDR | DW_IC_DEFAULT_FUNCTIONALITY;
  
@@@ -306,9 -324,9 +324,11 @@@ static int dw_i2c_plat_remove(struct pl
        pm_runtime_put_sync(&pdev->dev);
        if (!dev->pm_runtime_disabled)
                pm_runtime_disable(&pdev->dev);
+       if (!IS_ERR_OR_NULL(dev->rst))
+               reset_control_assert(dev->rst);
  
 +      i2c_dw_remove_lock_support(dev);
 +
        return 0;
  }
  

diff --cc kernel/locking/lockdep.c
Simple merge