]> git.itanic.dy.fi Git - linux-stable/commitdiff
Merge branch 'iomap-for-next' into mb/dio
authorTheodore Ts'o <tytso@mit.edu>
Tue, 5 Nov 2019 16:31:32 +0000 (11:31 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 5 Nov 2019 16:31:32 +0000 (11:31 -0500)
1  2 
fs/ext4/inode.c

diff --cc fs/ext4/inode.c
Simple merge