From: Jani Nikula <jani.nikula@intel.com>
Date: Tue, 22 Sep 2020 10:15:19 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master' into drm-intel-fixes
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b63c2eb1bfaaee9e328c7a53cb5d9b077cc59248;p=linux.git

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>
---

b63c2eb1bfaaee9e328c7a53cb5d9b077cc59248