Merge branch 'maint' into next

diff --cc configure
Simple merge

diff --cc configure.in
Simple merge

diff --cc e2fsck/Makefile.in
index 8ca329b7e6cabf54e0a2c3867290ae3ca4d7ff7b,77017efa4a78b3730a559141cf73fe31a33a2622..c23f1cbeb0089932f09ba4dbe6951e2ee70f9635
--- 1/e2fsck/Makefile.in
--- 2/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@@ -257,11 -273,12 +257,11 @@@ uninstall
                        $(DESTDIR)$(root_sbindir)/fsck.ext4 \
                        $(DESTDIR)$(root_sbindir)/fsck.ext4dev
  
- clean:
+ clean::
        $(RM) -f $(PROGS) \#* *\# *.s *.o *.a *~ core e2fsck.static \
                e2fsck.shared e2fsck.profiled flushb e2fsck.8 \
 -              tst_problem tst_crc32 tst_region tst_refcount gen_crc32table \
 -              crc32table.h e2fsck.conf.5 prof_err.c prof_err.h \
 -              test_profile
 +              tst_problem tst_region tst_refcount e2fsck.conf.5 \
 +              prof_err.c prof_err.h test_profile
        $(RM) -rf profiled
  
  mostlyclean: clean

diff --cc e2fsck/super.c
index 8cb6b47506b92945203728e424dd4956cf084f7d,81503d4b9b70755cf1313dd86207d1800625e7a8..e9892e2db6b35bef8375d5d1cce3f92c5e430f62
--- 1/e2fsck/super.c
--- 2/e2fsck/super.c
+++ b/e2fsck/super.c
@@@ -734,11 -722,13 +734,14 @@@ void check_super_block(e2fsck_t ctx
  #ifndef EXT2_SKIP_UUID
        /*
         * If the UUID field isn't assigned, assign it.
+        * Skip if checksums are enabled and the filesystem is mounted,
+        * if the id changes under the kernel remounting rw may fail.
         */
-       if (!(ctx->options & E2F_OPT_READONLY) && uuid_is_null(sb->s_uuid)) {
+       if (!(ctx->options & E2F_OPT_READONLY) && uuid_is_null(sb->s_uuid) &&
+           (!csum_flag || !(ctx->mount_flags & EXT2_MF_MOUNTED))) {
                if (fix_problem(ctx, PR_0_ADD_UUID, &pctx)) {
                        uuid_generate(sb->s_uuid);
 +                      ext2fs_init_csum_seed(fs);
                        fs->flags |= EXT2_FLAG_DIRTY;
                        fs->flags &= ~EXT2_FLAG_MASTER_SB_ONLY;
                }

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

diff --cc resize/resize2fs.c
Simple merge