]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitcdb898198d66b25c956981ce219b1126164108c2
tree22a68caea35b25309595167acc387c491d934d24
parent73525749f2ac1f7018d2754773a5ab1b46c65ae8
parent873fdb7702e27b8008ca9f2012a485d82347fd4d
Merge remote-tracking branch 'origin/master' into drm-intel-fixes

Direct backmerge to get commit fc95624fedd2 ("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>