Merge branch 'maint' into next

diff --cc debugfs/debugfs.c
Simple merge

diff --cc debugfs/set_fields.c
Simple merge

diff --cc debugfs/xattrs.c
Simple merge

diff --cc lib/ext2fs/swapfs.c
Simple merge

diff --cc misc/create_inode.c
Simple merge

diff --cc misc/ext4.5.in
Simple merge

diff --cc misc/tune2fs.c
Simple merge