Merge branch 'maint' into next

Conflicts:
	e2fsck/pass1.c

diff --cc MCONFIG.in
Simple merge

diff --cc configure
Simple merge

diff --cc configure.in
Simple merge

diff --cc e2fsck/e2fsck.h
Simple merge

diff --cc e2fsck/pass1.c
index eb9497c,9ef724a..180ecc8
--- 1/e2fsck/pass1.c
--- 2/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@@ -607,10 -558,9 +607,10 @@@ void e2fsck_pass1(e2fsck_t ctx
        struct ext2_super_block *sb = ctx->fs->super;
        const char      *old_op;
        unsigned int    save_type;
 -      int             imagic_fs, extent_fs;
 +      int             imagic_fs, extent_fs, inlinedata_fs;
-       int             busted_fs_time = 0;
+       int             low_dtime_check = 1;
        int             inode_size;
 +      int             failed_csum = 0;
  
        init_resource_track(&rtrack, ctx->fs->io);
        clear_problem_context(&pctx);

diff --cc e2fsck/problem.c
Simple merge

diff --cc e2fsck/unix.c
Simple merge

diff --cc lib/blkid/Makefile.in
Simple merge

diff --cc lib/config.h.in
Simple merge

diff --cc lib/e2p/Makefile.in
Simple merge

diff --cc lib/et/Makefile.in
Simple merge

diff --cc lib/ext2fs/Makefile.in
Simple merge

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

diff --cc lib/quota/Makefile.in
Simple merge

diff --cc lib/ss/Makefile.in
Simple merge

diff --cc lib/uuid/Makefile.in
Simple merge

diff --cc misc/mke2fs.c
Simple merge

diff --cc misc/tune2fs.c
Simple merge

diff --cc resize/resize2fs.c
Simple merge