Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

Backmerge Linus master to get the connector locking revert.

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux: (645 commits)
  sysctl: fix proc_doulongvec_ms_jiffies_minmax()
  Revert "drm/probe-helpers: Drop locking from poll_enable"
  MAINTAINERS: add Dan Streetman to zbud maintainers
  MAINTAINERS: add Dan Streetman to zswap maintainers
  mm: do not export ioremap_page_range symbol for external module
  mn10300: fix build error of missing fpu_save()
  romfs: use different way to generate fsid for BLOCK or MTD
  frv: add missing atomic64 operations
  mm, page_alloc: fix premature OOM when racing with cpuset mems update
  mm, page_alloc: move cpuset seqcount checking to slowpath
  mm, page_alloc: fix fast-path race with cpuset update or removal
  mm, page_alloc: fix check for NULL preferred_zone
  kernel/panic.c: add missing \n
  fbdev: color map copying bounds checking
  frv: add atomic64_add_unless()
  mm/mempolicy.c: do not put mempolicy before using its nodemask
  radix-tree: fix private list warnings
  Documentation/filesystems/proc.txt: add VmPin
  mm, memcg: do not retry precharge charges
  proc: add a schedule point in proc_pid_readdir()
  ...

diff --cc MAINTAINERS
Simple merge

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

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

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

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

diff --cc drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
Simple merge

diff --cc drivers/gpu/drm/cirrus/Kconfig
Simple merge

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

diff --cc drivers/gpu/drm/drm_probe_helper.c
index 97a32898ef50d41aa7d69f30e547901b3f1d13fc,cf8f0128c161ed6e1034322066c49d53a80b9e92..79519e4983c74b12b7d50bcf4707cd6ea6855946
--- 1/drivers/gpu/drm/drm_probe_helper.c
--- 2/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@@ -143,11 -141,20 +143,21 @@@ void drm_kms_helper_poll_enable_locked(
                                         DRM_CONNECTOR_POLL_DISCONNECT))
                        poll = true;
        }
 +      drm_connector_list_iter_put(&conn_iter);
  
        if (dev->mode_config.delayed_event) {
+               /*
+                * FIXME:
+                *
+                * Use short (1s) delay to handle the initial delayed event.
+                * This delay should not be needed, but Optimus/nouveau will
+                * fail in a mysterious way if the delayed event is handled as
+                * soon as possible like it is done in
+                * drm_helper_probe_single_connector_modes() in case the poll
+                * was enabled before.
+                */
                poll = true;
-               delay = 0;
+               delay = HZ;
        }
  
        if (poll)

diff --cc drivers/gpu/drm/etnaviv/etnaviv_mmu.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos5433_drm_decon.c
Simple merge

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

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

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

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

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

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

diff --cc drivers/gpu/drm/meson/meson_plane.c
Simple merge

diff --cc drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
Simple merge

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

diff --cc drivers/gpu/drm/virtio/virtgpu_fb.c
index 61254b991265e5af488eac6717ad87e3c04eb6e3,cde9f37581064828809555bb4808c38f7497d94e..24f99fc9d8a47a2fae3c29cef5de1f5e9861c674
--- 1/drivers/gpu/drm/virtio/virtgpu_fb.c
--- 2/drivers/gpu/drm/virtio/virtgpu_fb.c
+++ b/drivers/gpu/drm/virtio/virtgpu_fb.c
@@@ -331,9 -331,9 +331,9 @@@ static int virtio_gpufb_create(struct d
        info->fbops = &virtio_gpufb_ops;
        info->pixmap.flags = FB_PIXMAP_SYSTEM;
  
-       info->screen_base = obj->vmap;
+       info->screen_buffer = obj->vmap;
        info->screen_size = obj->gem_base.size;
 -      drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
 +      drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
        drm_fb_helper_fill_var(info, &vfbdev->helper,
                               sizes->fb_width, sizes->fb_height);