Backmerge tag 'v5.17-rc6' into drm-next
authorDave Airlie <airlied@redhat.com>
Mon, 28 Feb 2022 04:57:14 +0000 (14:57 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 28 Feb 2022 04:57:14 +0000 (14:57 +1000)
commit6c64ae228f0826859c56711ce133aff037d6205f
tree831f7b3c5a4eb3a5ab932edb6ca27780a316e714
parent6d09e5cbc9633fa4df88544952614e9137d274af
parent7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3
Backmerge tag 'v5.17-rc6' into drm-next

This backmerges v5.17-rc6 so I can merge some amdgpu and some tegra changes on top.

Signed-off-by: Dave Airlie <airlied@redhat.com>
16 files changed:
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
drivers/gpu/drm/amd/amdgpu/soc15.c
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/drm_gem_cma_helper.c
drivers/gpu/drm/i915/Kconfig
drivers/gpu/drm/i915/gvt/gtt.c
drivers/gpu/drm/mediatek/mtk_dsi.c
drivers/gpu/drm/radeon/radeon_uvd.c
drivers/gpu/drm/tegra/Kconfig
drivers/gpu/drm/tegra/dpaux.c
drivers/gpu/drm/vc4/vc4_hdmi.c
drivers/gpu/drm/vc4/vc4_hdmi.h
drivers/platform/x86/thinkpad_acpi.c