Backmerge tag 'v5.13-rc7' into drm-next
authorDave Airlie <airlied@redhat.com>
Wed, 23 Jun 2021 00:07:48 +0000 (10:07 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 23 Jun 2021 00:07:48 +0000 (10:07 +1000)
commitf45fbbb6d5cff29ddfc708676ec1c2496eed3a07
tree5496fee9f6b10da368aa49b03612061156e42d2f
parentd472b36efbf8a27dc8a80519db8b5a8caffe42b6
parent13311e74253fe64329390df80bed3f07314ddd61
Backmerge tag 'v5.13-rc7' into drm-next

Backmerge Linux 5.13-rc7 to make some pulls from later bases apply,
and to bake in the conflicts so far.
MAINTAINERS
drivers/gpu/drm/drm_auth.c
drivers/gpu/drm/drm_ioctl.c
drivers/gpu/drm/mcde/mcde_dsi.c
drivers/gpu/drm/meson/meson_drv.c
drivers/gpu/drm/msm/msm_gem.c
drivers/gpu/drm/ttm/ttm_bo.c
drivers/gpu/drm/ttm/ttm_device.c
drivers/gpu/drm/vc4/vc4_kms.c
include/linux/pci.h