Merge tag 'v5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorDave Airlie <airlied@redhat.com>
Mon, 25 Jan 2021 04:35:44 +0000 (14:35 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 25 Jan 2021 04:35:44 +0000 (14:35 +1000)
commitbc96ad6722f86a377ed2872c9a4854c90caf78ca
treeece8859165a1faa10e4e2203d231fc7e87925139
parentd82afcf9caaac26ce2642511115bca9dacf30f41
parent6ee1d745b7c9fd573fba142a2efdad76a9f1cb04
Merge tag 'v5.11-rc5' of git://git./linux/kernel/git/torvalds/linux into drm-next

Backmerge v5.11-rc5 into drm-next to clean up a bunch of conflicts we are dragging around.

Signed-off-by: Dave Airlie <airlied@redhat.com>
16 files changed:
MAINTAINERS
arch/arm/configs/omap2plus_defconfig
drivers/dma-buf/dma-buf.c
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
drivers/gpu/drm/drm_atomic_helper.c
drivers/gpu/drm/drm_plane.c
drivers/gpu/drm/i915/display/intel_dp.c
drivers/gpu/drm/i915/gvt/vgpu.c
drivers/gpu/drm/msm/msm_gem.c
drivers/gpu/drm/radeon/radeon_ttm.c
drivers/gpu/drm/vc4/vc4_hdmi.c