]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 99b8788 21d0a5c)
Merge v5.8-rc6 into drm-next
authorDave Airlie <airlied@redhat.com>
Thu, 23 Jul 2020 22:28:09 +0000 (08:28 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 23 Jul 2020 22:48:05 +0000 (08:48 +1000)
commit6e9d8ce2103d9ebef9c42934de13d59b707421c4
tree2fc35aac6abe32b99058ad55b0fc6e4d449d1056tree | snapshot
parent99b8788262561e3da4c73eb4a465204c644f4b16commit | diff
parent21d0a5cf950768933cb88e716f8a3bf1031bcec4commit | diff
Merge v5.8-rc6 into drm-next

I've got a silent conflict + two trees based on fixes to merge.

Fixes a silent merge with amdgpu

Signed-off-by: Dave Airlie <airlied@redhat.com>
28 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/dma-buf/dma-buf.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c diff1 | diff2 | blob | history
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/drm_fb_helper.c diff1 | diff2 | blob | history
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/display/intel_fbc.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/display/intel_hdmi.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/gt/intel_lrc.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/gt/selftest_rps.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/gvt/handlers.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_drv.h diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_vma.c diff1 | diff2 | blob | history
drivers/gpu/drm/mcde/mcde_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/mediatek/mtk_drm_crtc.c diff1 | diff2 | blob | history
drivers/gpu/drm/mediatek/mtk_hdmi.c diff1 | diff2 | blob | history
drivers/gpu/drm/meson/meson_registers.h diff1 | diff2 | blob | history
drivers/gpu/drm/msm/adreno/a6xx_gpu.c diff1 | diff2 | blob | history
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c diff1 | diff2 | blob | history
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c diff1 | diff2 | blob | history
drivers/gpu/drm/nouveau/dispnv50/disp.c diff1 | diff2 | blob | history
drivers/gpu/drm/nouveau/nouveau_dmem.c diff1 | diff2 | blob | history
drivers/gpu/drm/panel/panel-simple.c diff1 | diff2 | blob | history
drivers/gpu/drm/tegra/dc.c diff1 | diff2 | blob | history
drivers/gpu/drm/ttm/ttm_bo.c diff1 | diff2 | blob | history
drivers/gpu/drm/ttm/ttm_bo_vm.c diff1 | diff2 | blob | history
drivers/video/fbdev/core/fbcon.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.