git.kernel.dk Git - linux-2.6-block.git/commit

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Wed, 4 Jan 2017 10:41:10 +0000 (11:41 +0100)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Wed, 4 Jan 2017 10:41:10 +0000 (11:41 +0100)
commit	ef426c103892eed94a9bb0ee59c2d0e6eac5179f
tree	2d998f23fa6e3b3c51f4829f1f881b42e79b7c04	tree \| snapshot
parent	a402eae64d0ad12b1c4a411f250d6c161e67f623	commit \| diff
parent	9b8b75de4cb379187c481a5332a12429f31c0887	commit \| diff

Merge tag 'drm-misc-next-2016-12-30' of git://anongit.freedesktop.org/git/drm-misc into drm-intel-next-queued

Directly merge drm-misc into drm-intel since Dave is on vacation and
we need the various drm-misc patches (fb format rework, drm mm fixes,
selftest framework and others). Also pulled back -rc2 in first to
resync with drm-intel-fixes and make sure I can reuse the exact rerere
solutions from drm-tip for safety, and because I'm lazy.

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

20 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ast/ast_main.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/gma500/framebuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_evict.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_gtt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_vma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_fbc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_fbdev.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_overlay.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_sprite.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tilcdc/tilcdc_crtc.c	diff1 \|	diff2 \|	blob \| history
include/drm/drmP.h	diff1 \|	diff2 \|	blob \| history
lib/Makefile	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ast/ast_main.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/gma500/framebuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_evict.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_gtt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_vma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_fbc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_fbdev.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_overlay.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_sprite.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tilcdc/tilcdc_crtc.c	diff1 \|	diff2 \|	blob \| history
include/drm/drmP.h	diff1 \|	diff2 \|	blob \| history
lib/Makefile	diff1 \|	diff2 \|	blob \| history