]> 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)
commit79c2955d5b5810a5579205b02d110979016cb6e6
tree22a68caea35b25309595167acc387c491d934d24
parentb0e5781a19ed88b82bc3a52fa6c2d0dacc709a66
parentcc0755c3f45b8ece91169df2768d4cdcfdab3669
Merge remote-tracking branch 'origin/master' into drm-intel-fixes

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