OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
77ef385
d012a71
)
Merge tag 'v5.9-rc2' into drm-misc-fixes
author
Maarten Lankhorst
<maarten.lankhorst@linux.intel.com>
Tue, 25 Aug 2020 09:00:02 +0000
(11:00 +0200)
committer
Maarten 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
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/drm_crtc.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/drm_dp_mst_topology.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/drm_plane.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/gpu/drm/drm_atomic_helper.c
Simple merge
diff --cc
drivers/gpu/drm/drm_crtc.c
Simple merge
diff --cc
drivers/gpu/drm/drm_dp_mst_topology.c
Simple merge
diff --cc
drivers/gpu/drm/drm_plane.c
Simple merge