]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
BackMerge tag 'v5.15-rc7' into drm-next
authorDave Airlie <airlied@redhat.com>
Thu, 28 Oct 2021 04:59:38 +0000 (14:59 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 28 Oct 2021 04:59:38 +0000 (14:59 +1000)
commit970eae15600a883e4ad27dd0757b18871cc983ab
tree7aeb639a35ca2ab8b54a5987837f8ac5f96ee5f4
parent27f4432577e4f78bbdf15c104748cc738db8eead
parent3906fe9bb7f1a2c8667ae54e967dc8690824f4ea
BackMerge tag 'v5.15-rc7' into drm-next

The msm next tree is based on rc3, so let's just backmerge rc7 before pulling it in.

Signed-off-by: Dave Airlie <airlied@redhat.com>
19 files changed:
MAINTAINERS
arch/arm/configs/imx_v6_v7_defconfig
arch/arm/configs/multi_v7_defconfig
arch/arm/configs/shmobile_defconfig
arch/arm64/configs/defconfig
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
drivers/gpu/drm/amd/display/include/dal_asic_id.h
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/i915/gt/intel_context.c
drivers/gpu/drm/i915/gvt/scheduler.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/msm/Kconfig
drivers/gpu/drm/msm/msm_gem_submit.c
drivers/gpu/drm/nouveau/nouveau_bo.c
drivers/gpu/drm/panel/Kconfig
drivers/gpu/drm/r128/ati_pcigart.c
drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c
drivers/gpu/drm/vc4/vc4_hdmi.c