git.maquefel.me Git - linux.git/commit

author	Dave Airlie <airlied@redhat.com>
	Mon, 4 Mar 2019 02:02:55 +0000 (12:02 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Mon, 4 Mar 2019 02:02:55 +0000 (12:02 +1000)
commit	2c3cd66f4c66b169c18a2dbebbc894681d282278
tree	9d2e055ea43e177914a4cce9d007982a7417623c	tree \| snapshot
parent	7fbd5d784f75750199c21918da9b2fc92af371e6	commit \| diff
parent	1c163f4c7b3f621efff9b28a47abb36f7378d783	commit \| diff

Merge v5.0 into drm-next

There is a really hairy resolution involving amdgpu fixes, that I'd rather confirm here.

Also some misc fixes are landed by me, but the pr has them as well.

Signed-off-by: Dave Airlie <airlied@redhat.com>

12 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/bochs/bochs_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_atomic_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_fbdev.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/bochs/bochs_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_atomic_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_fbdev.c	diff1 \|	diff2 \|	blob \| history