]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'mb/dio' into master
authorTheodore Ts'o <tytso@mit.edu>
Tue, 5 Nov 2019 21:21:09 +0000 (16:21 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 5 Nov 2019 21:21:09 +0000 (16:21 -0500)
1  2 
fs/ext4/ext4.h
fs/ext4/extents.c
fs/ext4/inode.c

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