BackMerge commit '98477740630f270aecf648f1d6a9dbc6027d4ff1' into drm-fixes
authorDave Airlie <airlied@redhat.com>
Fri, 25 Sep 2020 01:06:18 +0000 (11:06 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 25 Sep 2020 01:06:18 +0000 (11:06 +1000)
commit720777c5be95a9e51288c8157b561febf9052e55
treed5e701940f489e5b41c57adb99c4f88883c91e9f
parent3de5f98dafbb0a5ac6aafea2e6d3b2bea4950695
parent98477740630f270aecf648f1d6a9dbc6027d4ff1
BackMerge commit '98477740630f270aecf648f1d6a9dbc6027d4ff1' into drm-fixes

The dax mess had some fallout, and i915 used a later base to fix their CI.

Signed-off-by: Dave Airlie <airlied@redhat.com>