Merge tag 'v4.6-rc3' into drm-intel-next-queued

Linux 4.6-rc3

Backmerge requested by Chris Wilson to make his patches apply cleanly.
Tiny conflict in vmalloc.c with the (properly acked and all) patch in
drm-intel-next:

commit 4da56b99d99e5a7df2b7f11e87bfea935f909732
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Mon Apr 4 14:46:42 2016 +0100

    mm/vmap: Add a notifier for when we run out of vmap address space

and Linus' tree.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

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

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

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

diff --cc mm/vmalloc.c
index 12d27ac,ae7d20b..293889d
--- 1/mm/vmalloc.c
--- 2/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@@ -473,19 -468,9 +473,19 @@@ overflow
                purged = 1;
                goto retry;
        }
 +
 +      if (gfpflags_allow_blocking(gfp_mask)) {
 +              unsigned long freed = 0;
 +              blocking_notifier_call_chain(&vmap_notify_list, 0, &freed);
 +              if (freed > 0) {
 +                      purged = 0;
 +                      goto retry;
 +              }
 +      }
 +
        if (printk_ratelimit())
-               pr_warn("vmap allocation for size %lu failed: "
-                       "use vmalloc=<size> to increase size.\n", size);
+               pr_warn("vmap allocation for size %lu failed: use vmalloc=<size> to increase size\n",
+                       size);
        kfree(va);
        return ERR_PTR(-EBUSY);
  }