git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Mon, 11 Apr 2016 17:21:06 +0000 (19:21 +0200)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Mon, 11 Apr 2016 17:25:13 +0000 (19:25 +0200)
commit	39702853197b191bda32315260255053aa3e57f7
tree	00185427bd7c5e6a335c9ea99ed7ee65b9ceaa9c	tree \| snapshot
parent	fb8621d3bee88badeb25dccce0fb59ad145dba9e	commit \| diff
parent	bf16200689118d19de1b8d2a3c314fc21f5dc7bb	commit \| 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>

Linux Kernel Source Tree.

RSS Atom

drivers/gpu/drm/i915/i915_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_dmabuf.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_userptr.c	diff1 \|	diff2 \|	blob \| history
mm/vmalloc.c	diff1 \|	diff2 \|	blob \| history