OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ba4f184
9847774
)
Merge remote-tracking branch 'origin/master' into drm-intel-fixes
author
Jani Nikula
<jani.nikula@intel.com>
Tue, 22 Sep 2020 10:15:19 +0000
(13:15 +0300)
committer
Jani Nikula
<jani.nikula@intel.com>
Tue, 22 Sep 2020 10:15:42 +0000
(13:15 +0300)
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>
Trivial merge