Merge branch 'tt/misc' into dev

author Theodore Ts'o <tytso@mit.edu>

Tue, 19 Nov 2019 17:25:42 +0000 (12:25 -0500)

committer Theodore Ts'o <tytso@mit.edu>

Tue, 19 Nov 2019 17:25:42 +0000 (12:25 -0500)
author Theodore Ts'o <tytso@mit.edu>
Tue, 19 Nov 2019 17:25:42 +0000 (12:25 -0500)
committer Theodore Ts'o <tytso@mit.edu>
Tue, 19 Nov 2019 17:25:42 +0000 (12:25 -0500)
diff --cc fs/ext4/inode.c
Simple merge
diff --cc fs/ext4/super.c
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Tue, 19 Nov 2019 17:25:42 +0000 (12:25 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Tue, 19 Nov 2019 17:25:42 +0000 (12:25 -0500)
		1	2
fs/ext4/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/ext4/super.c	patch \|	diff1 \|	diff2 \|	blob \| history