Merge branch 'maint' into next

Conflicts:
	debugfs/debugfs.c
	e2fsck/pass5.c

diff --cc debugfs/debugfs.c
index 5ab43a3e57650d73600e531e5e0141ba8bca4410,b6ba1da46bd0ea70a858bb47fc1e343ef092032a..641e8bc31c96c0a09b916c708b6f5891d9350deb
--- 1/debugfs/debugfs.c
--- 2/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@@ -2093,8 -2347,6 +2093,7 @@@ void do_symlink(int argc, char *argv[]
  
  void do_dump_mmp(int argc EXT2FS_ATTR((unused)), char *argv[])
  {
-       struct ext2_super_block *sb;
 +#if CONFIG_MMP
        struct mmp_struct *mmp_s;
        time_t t;
        errcode_t retval = 0;

diff --cc e2fsck/pass5.c
Simple merge

diff --cc e2fsck/super.c
Simple merge

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

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

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

diff --cc lib/ext2fs/ext2_fs.h
Simple merge

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

diff --cc misc/tune2fs.c
Simple merge

diff --cc resize/resize2fs.c
Simple merge

diff --cc util/subst.c
Simple merge