OSDN Git Service

Merge v5.10-rc3 into drm-next
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 10 Nov 2020 12:58:05 +0000 (13:58 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 10 Nov 2020 13:36:36 +0000 (14:36 +0100)
commit512bce50a41c528fa15c4c014293e7bebf018658
tree090a6989d3d12f99ed2475b9ee8069166b9cb5d3
parent5b8c596976d4338942dd889b66cd06dc766424e1
parentf8394f232b1eab649ce2df5c5f15b0e528c92091
Merge v5.10-rc3 into drm-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: Daniel Vetter <daniel.vetter@ffwll.ch>
MAINTAINERS
drivers/gpu/drm/amd/display/include/dal_asic_id.h
drivers/gpu/drm/i915/gvt/handlers.c
drivers/gpu/drm/panfrost/panfrost_drv.c
drivers/gpu/drm/panfrost/panfrost_gem.c
drivers/gpu/drm/vc4/vc4_bo.c
drivers/gpu/drm/vc4/vc4_drv.c
drivers/gpu/drm/vc4/vc4_drv.h
drivers/gpu/drm/vc4/vc4_hvs.c