Merge branch 'maint' into next

diff --cc tests/f_convert_bmap_sparse/expect.1
index 0000000,74a8034..095fb2b
mode 000000,100644..100644
--- /dev/null
--- 2/tests/f_convert_bmap_sparse/expect.1
+++ b/tests/f_convert_bmap_sparse/expect.1
@@@ -1,0 -1,24 +1,24 @@@
 -File ACL: 0    Directory ACL: 0
+ debugfs: stat /realmode.bin
+ Inode: 12   Type: regular    Mode:  0775   Flags: 0x0
+ Generation: 2022334337    Version: 0x00000001
+ User:  1000   Group:  1000   Size: 21080
++File ACL: 0
+ Links: 1   Blockcount: 16
+ Fragment:  Address: 0    Number: 0    Size: 0
+ ctime: 0x5924849d -- Tue May 23 18:51:09 2017
+ atime: 0x59247d36 -- Tue May 23 18:19:34 2017
+ mtime: 0x591e1764 -- Thu May 18 21:51:32 2017
+ BLOCKS:
+ (0):513, (4-8):514-518, (IND):58, (20):2005
+ TOTAL: 8
+ 
+ Pass 1: Checking inodes, blocks, and sizes
+ Pass 1E: Optimizing extent trees
+ Pass 2: Checking directory structure
+ Pass 3: Checking directory connectivity
+ Pass 4: Checking reference counts
+ Pass 5: Checking group summary information
+ 
+ test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
+ test_filesys: 12/256 files (8.3% non-contiguous), 65/2048 blocks
+ Exit status is 0