git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	Maxime Ripard <mripard@kernel.org>
	Thu, 3 Oct 2019 14:38:50 +0000 (16:38 +0200)
committer	Maxime Ripard <mripard@kernel.org>
	Thu, 3 Oct 2019 14:38:50 +0000 (16:38 +0200)
commit	4092de1ba34eb376791809fb366bc15f8a9e0b7c
tree	6262d4dfcfa7ff9eda8e8d1d0a711711fcae8785	tree \| snapshot
parent	a00d17e0a71ae2e4fdaac46e1c12785d3346c3f2	commit \| diff
parent	54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c	commit \| diff

Merge drm/drm-next into drm-misc-next

We haven't done any backmerge for a while due to the merge window, and it
starts to become an issue for komeda. Let's bring 5.4-rc1 in.

Signed-off-by: Maxime Ripard <mripard@kernel.org>

48 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/dce_virtual.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/arm/display/komeda/komeda_dev.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/arm/display/komeda/komeda_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ast/ast_main.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ast/ast_mode.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_atomic_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_atomic_uapi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_client_modeset.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_crtc_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/etnaviv/etnaviv_buffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/hisilicon/hibmc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_connector.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/mcde/mcde_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/mcde/mcde_dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/hdmi/hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/hdmi/hdmi.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/dispnv04/disp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/dispnv50/disp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_connector.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/dss/output.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/panfrost/panfrost_devfreq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/qxl/qxl_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_connectors.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_ttm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sun4i/sun4i_tcon.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_bo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/video/fbdev/sa1100fb.c	diff1 \|	diff2 \|	blob \| history
include/drm/drm_crtc.h	diff1 \|	diff2 \|	blob \| history
include/drm/ttm/ttm_bo_driver.h	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/dce_virtual.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/arm/display/komeda/komeda_dev.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/arm/display/komeda/komeda_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ast/ast_main.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ast/ast_mode.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_atomic_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_atomic_uapi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_client_modeset.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_crtc_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/etnaviv/etnaviv_buffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/hisilicon/hibmc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_connector.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/mcde/mcde_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/mcde/mcde_dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/hdmi/hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/hdmi/hdmi.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/dispnv04/disp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/dispnv50/disp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_connector.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/dss/output.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/panfrost/panfrost_devfreq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/qxl/qxl_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_connectors.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_ttm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sun4i/sun4i_tcon.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_bo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/video/fbdev/sa1100fb.c	diff1 \|	diff2 \|	blob \| history
include/drm/drm_crtc.h	diff1 \|	diff2 \|	blob \| history
include/drm/ttm/ttm_bo_driver.h	diff1 \|	diff2 \|	blob \| history