| commit | 39702853197b191bda32315260255053aa3e57f7 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Mon Apr 11 19:21:06 2016 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Mon Apr 11 19:25:13 2016 +0200 |
| tree | 00185427bd7c5e6a335c9ea99ed7ee65b9ceaa9c | |
| parent | fb8621d3bee88badeb25dccce0fb59ad145dba9e [diff] | |
| parent | bf16200689118d19de1b8d2a3c314fc21f5dc7bb [diff] |
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>