| commit | b63c2eb1bfaaee9e328c7a53cb5d9b077cc59248 | [log] [tgz] |
|---|---|---|
| author | Jani Nikula <jani.nikula@intel.com> | Tue Sep 22 13:15:19 2020 +0300 |
| committer | Jani Nikula <jani.nikula@intel.com> | Tue Sep 22 13:15:42 2020 +0300 |
| tree | 22a68caea35b25309595167acc387c491d934d24 | |
| parent | ba4f184e126b751d1bffad5897f263108befc780 [diff] | |
| parent | 98477740630f270aecf648f1d6a9dbc6027d4ff1 [diff] |
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>