Merge remote-tracking branch 'origin/master' into drm-intel-fixes
authorJani Nikula <jani.nikula@intel.com>
Tue, 22 Sep 2020 10:15:19 +0000 (13:15 +0300)
committerJani Nikula <jani.nikula@intel.com>
Tue, 22 Sep 2020 10:15:42 +0000 (13:15 +0300)
commitb63c2eb1bfaaee9e328c7a53cb5d9b077cc59248
tree22a68caea35b25309595167acc387c491d934d24
parentba4f184e126b751d1bffad5897f263108befc780
parent98477740630f270aecf648f1d6a9dbc6027d4ff1
Merge remote-tracking branch 'origin/master' into drm-intel-fixes

Direct backmerge to get commit 88b67edd7247 ("dax: Fix compilation for
CONFIG_DAX && !CONFIG_FS_DAX") to fix CI build issues.

Acked-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>