From: Dave Airlie <airlied@redhat.com>
Date: Fri, 7 Feb 2020 02:23:24 +0000 (+1000)
Subject: Merge branch 'linux-5.6' of git://github.com/skeggsb/linux into drm-next
X-Git-Tag: v5.15~4520^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a345cc0d393edddde8e83aadf8be5223316442aa;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'linux-5.6' of git://github.com/skeggsb/linux into drm-next

Just a couple of fixes to Volta/Turing modesetting on some systems.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ <CACAvsv7=eP+Ai1ouoMyYyo1xMF0pTQki=owYjJkS=NpvKQd1fg@mail.gmail.com
---

a345cc0d393edddde8e83aadf8be5223316442aa