Merge branch 'maint' into next

Conflicts:

	lib/ext2fs/closefs.c

diff --cc configure
Simple merge

diff --cc configure.in
Simple merge

diff --cc debian/rules
index d3e2494,b66555a..b49b0ca
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -89,10 -94,10 +94,10 @@@ COMMON_CONF_FLAGS =  
                  --infodir=/usr/share/info --enable-fsck
  
  STD_CONF_FLAGS = --with-ccopts="${CCOPTS}" --enable-compression \
-               --enable-blkid-devmapper
+               ${DEVMAPPER}
  
  BF_CONF_FLAGS = --with-ccopts="${CCOPTS} ${BF_CCOPTS}" \
 -      --disable-nls --disable-swapfs --disable-imager \
 +      --disable-nls --disable-imager \
        --disable-debugfs  --disable-e2initrd-helper
  
  MIPS_NOPIC_CONF_FLAGS = --with-ccopts="${CCOPTS}" \

diff --cc lib/blkid/probe.c
Simple merge

diff --cc lib/ext2fs/closefs.c
index 0f97704,88c515a..a523c8e
--- 1/lib/ext2fs/closefs.c
--- 2/lib/ext2fs/closefs.c
+++ b/lib/ext2fs/closefs.c
@@@ -247,9 -256,12 +249,10 @@@ errcode_t ext2fs_flush(ext2_filsys fs
         * we write out the backup superblocks.)
         */
        fs->super->s_state &= ~EXT2_VALID_FS;
 -#ifdef EXT2FS_ENABLE_SWAPFS
 -      if (fs->flags & EXT2_FLAG_SWAP_BYTES) {
 -              *super_shadow = *fs->super;
 -              ext2fs_swap_super(super_shadow);
 -      }
+       fs->super->s_feature_incompat &= ~EXT3_FEATURE_INCOMPAT_RECOVER;
 +#ifdef WORDS_BIGENDIAN
 +      *super_shadow = *fs->super;
 +      ext2fs_swap_super(super_shadow);
  #endif
  
        /*
@@@ -323,9 -335,12 +326,10 @@@ write_primary_superblock_only
  
        fs->super->s_block_group_nr = 0;
        fs->super->s_state = fs_state;
 -#ifdef EXT2FS_ENABLE_SWAPFS
 -      if (fs->flags & EXT2_FLAG_SWAP_BYTES) {
 -              *super_shadow = *fs->super;
 -              ext2fs_swap_super(super_shadow);
 -      }
+       fs->super->s_feature_incompat = feature_incompat;
 +#ifdef WORDS_BIGENDIAN
 +      *super_shadow = *fs->super;
 +      ext2fs_swap_super(super_shadow);
  #endif
  
        retval = io_channel_flush(fs->io);

diff --cc misc/Makefile.in
Simple merge