Merge drm/drm-next into drm-misc-next
authorThomas Zimmermann <tzimmermann@suse.de>
Tue, 10 Nov 2020 16:11:37 +0000 (17:11 +0100)
committerThomas Zimmermann <tzimmermann@suse.de>
Tue, 10 Nov 2020 16:11:37 +0000 (17:11 +0100)
commit112e505a76de69f8667e2fe8da38433f754364a8
tree75fba3a00d8c093604f83bdd8a3c3c1e0b94f823
parent55c8bcaeccaa5c6d9e7a432ebd0a1717f488a3f4
parent512bce50a41c528fa15c4c014293e7bebf018658
Merge drm/drm-next into drm-misc-next

We need commit f8f6ae5d077a ("mm: always have io_remap_pfn_range() set
pgprot_decrypted()") to be able to merge Jason's cleanup patch.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/imx/imx-drm-core.c
drivers/gpu/drm/panfrost/panfrost_drv.c
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/vc4/vc4_bo.c
drivers/gpu/drm/vc4/vc4_drv.h