Merge branch 'maint'

diff --cc debian/rules
Simple merge

diff --cc e2fsck/e2fsck.h
index 99c0ae5,5af82d5..9ccffd8
--- 1/e2fsck/e2fsck.h
--- 2/e2fsck/e2fsck.h
+++ b/e2fsck/e2fsck.h
@@@ -455,7 -454,11 +456,8 @@@ void e2fsck_rehash_directories(e2fsck_
  
  /* super.c */
  void check_super_block(e2fsck_t ctx);
+ int check_backup_super_block(e2fsck_t ctx);
  
 -/* swapfs.c */
 -void swap_filesys(e2fsck_t ctx);
 -
  /* util.c */
  extern void *e2fsck_allocate_memory(e2fsck_t ctx, unsigned int size,
                                    const char *description);

diff --cc e2fsck/journal.c
Simple merge

diff --cc e2fsck/pass2.c
Simple merge

diff --cc e2fsck/unix.c
index 25870d8,183116d..291ff85
--- 1/e2fsck/unix.c
--- 2/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@@ -265,9 -268,13 +266,12 @@@ static void check_if_skip(e2fsck_t ctx
        if (!defer_check_on_battery)
                batt = 0;
  
 -      if ((ctx->options & E2F_OPT_FORCE) || bad_blocks_file ||
 -          cflag || swapfs)
 +      if ((ctx->options & E2F_OPT_FORCE) || bad_blocks_file || cflag)
                return;
        
+       lastcheck = fs->super->s_lastcheck;
+       if (lastcheck > ctx->now)
+               lastcheck -= ctx->time_fudge;
        if ((fs->super->s_state & EXT2_ERROR_FS) ||
            !ext2fs_test_valid(fs))
                reason = _(" contains a file system with errors");

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

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