]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'v5.9-rc2' into drm-misc-fixes
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Tue, 25 Aug 2020 09:00:02 +0000 (11:00 +0200)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Tue, 25 Aug 2020 09:00:02 +0000 (11:00 +0200)
Backmerge requested by Tomi for a fix to omap inconsistent
locking state issue, and because we need at least v5.9-rc2 now.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
1  2 
drivers/gpu/drm/drm_atomic_helper.c
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/drm_dp_mst_topology.c
drivers/gpu/drm/drm_plane.c

Simple merge
Simple merge
Simple merge
Simple merge