Merge remote-tracking branch 'origin/master' into drm-intel-fixes

Direct backmerge to get commit 88b67edd72 ("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>
This commit is contained in:
Jani Nikula 2020-09-22 13:15:19 +03:00
commit b63c2eb1bf
7 changed files with 46 additions and 35 deletions