diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-04-11 19:21:06 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-04-11 19:25:13 +0200 |
| commit | 39702853197b191bda32315260255053aa3e57f7 (patch) | |
| tree | 00185427bd7c5e6a335c9ea99ed7ee65b9ceaa9c /fs/nfs_common | |
| parent | drm/i915: Avoid allocating a vmap arena for a single page (diff) | |
| parent | Linux 4.6-rc3 (diff) | |
| download | linux-39702853197b191bda32315260255053aa3e57f7.tar.xz linux-39702853197b191bda32315260255053aa3e57f7.zip | |
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>
Diffstat (limited to 'fs/nfs_common')
0 files changed, 0 insertions, 0 deletions