Merge branch 'maint' into next

Conflicts:
	debugfs/set_fields.c
	tests/f_mmp/script
	tests/f_mmp_garbage/script
	tests/m_mmp/script
	tests/t_mmp_1on/script
	tests/t_mmp_2off/script

diff --cc MCONFIG.in
Simple merge

diff --cc configure
index 53405aa,87fd2f3..dda21f1
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -853,12 -878,11 +878,14 @@@ enable_fsc
  enable_e2initrd_helper
  enable_tls
  enable_uuidd
 +enable_mmp
 +enable_bmap_stats
 +enable_bmap_stats_ops
  enable_nls
+ enable_threads
  with_gnu_ld
  enable_rpath
+ with_libpth_prefix
  with_libiconv_prefix
  with_included_gettext
  with_libintl_prefix
@@@ -1513,10 -1538,10 +1541,13 @@@ Optional Features
    --enable-e2initrd-helper build e2initrd-helper program
    --disable-tls           disable use of thread local support
    --disable-uuidd         disable building the uuid daemon
 +  --disable-mmp           disable support mmp, Multi Mount Protection
 +  --disable-bmap-stats    disable collection of bitmap stats.
 +  --enable-bmap-stats-ops enable collection of additional bitmap stats
    --disable-nls           do not use Native Language Support
+   --enable-threads={posix|solaris|pth|windows}
+                           specify multithreading API
+   --disable-threads       build without multithread safety
    --disable-rpath         do not hardcode runtime library paths
  
  Optional Packages:

diff --cc configure.in
Simple merge

diff --cc debian/e2fslibs.symbols
Simple merge

diff --cc debugfs/debugfs.c
Simple merge

diff --cc debugfs/set_fields.c
index 762e655,d017eea..b4ca546
--- 1/debugfs/set_fields.c
--- 2/debugfs/set_fields.c
+++ b/debugfs/set_fields.c
@@@ -153,7 -153,17 +153,18 @@@ static struct field_set_info super_fiel
        { "backup_bgs", &set_sb.s_backup_bgs[0], NULL, 4, parse_uint,
          FLAG_ARRAY, 2 },
        { "checksum", &set_sb.s_checksum, NULL, 4, parse_uint },
 +      { "checksum_type", &set_sb.s_checksum_type, NULL, 1, parse_uint },
+       { "error_count", &set_sb.s_error_count, NULL, 4, parse_uint },
+       { "first_error_time", &set_sb.s_first_error_time, NULL, 4, parse_time },
+       { "first_error_ino", &set_sb.s_first_error_ino, NULL, 4, parse_uint },
+       { "first_error_block", &set_sb.s_first_error_block, NULL, 8, parse_uint },
+       { "first_error_func", &set_sb.s_first_error_func, NULL, 32, parse_string },
+       { "first_error_line", &set_sb.s_first_error_ino, NULL, 4, parse_uint },
+       { "last_error_time", &set_sb.s_last_error_time, NULL, 4, parse_time },
+       { "last_error_ino", &set_sb.s_last_error_ino, NULL, 4, parse_uint },
+       { "last_error_block", &set_sb.s_last_error_block, NULL, 8, parse_uint },
+       { "last_error_func", &set_sb.s_last_error_func, NULL, 32, parse_string },
+       { "last_error_line", &set_sb.s_last_error_ino, NULL, 4, parse_uint },
        { 0, 0, 0, 0 }
  };
  

diff --cc e2fsck/Makefile.in
Simple merge

diff --cc e2fsck/e2fsck.h
Simple merge

diff --cc e2fsck/journal.c
Simple merge

diff --cc e2fsck/message.c
Simple merge

diff --cc e2fsck/problem.c
Simple merge

diff --cc e2fsck/unix.c
Simple merge

diff --cc e2fsck/util.c
Simple merge

diff --cc lib/blkid/Makefile.in
index a27b20c,6cabd36..e020a77
--- 1/lib/blkid/Makefile.in
--- 2/lib/blkid/Makefile.in
+++ b/lib/blkid/Makefile.in
@@@ -56,9 -55,7 +55,8 @@@ DEPLIBS_BLKID=        $(DEPSTATIC_LIBBLKID) $(
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 +      $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
  @PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
- @CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
  @ELF_CMT@     $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
  @BSDLIB_CMT@  $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
  

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

diff --cc lib/e2p/Makefile.in
index c8925cf,1c71c1c..7286552
--- 1/lib/e2p/Makefile.in
--- 2/lib/e2p/Makefile.in
+++ b/lib/e2p/Makefile.in
@@@ -56,9 -55,7 +55,8 @@@ BSDLIB_INSTALL_DIR = $(root_libdir
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 +      $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
  @PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
- @CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
  @ELF_CMT@     $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
  @BSDLIB_CMT@  $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
  

diff --cc lib/et/Makefile.in
index f9a79c0,68c3baf..dbf7c1a
--- 1/lib/et/Makefile.in
--- 2/lib/et/Makefile.in
+++ b/lib/et/Makefile.in
@@@ -44,9 -44,7 +44,8 @@@ BSDLIB_INSTALL_DIR = $(root_libdir
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 +      $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
  @PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
- @CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
  @ELF_CMT@     $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
  @BSDLIB_CMT@  $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
  

diff --cc lib/ext2fs/Makefile.in
index ddf5942,6cc299d..c392107
--- 1/lib/ext2fs/Makefile.in
--- 2/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@@ -233,9 -226,7 +232,8 @@@ all:: ext2fs.pc tst_libext2f
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 +      $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
  @PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
- @CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
  @ELF_CMT@     $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
  @BSDLIB_CMT@  $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
  

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

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

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

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

diff --cc lib/quota/Makefile.in
index 87fa08f,4dd42ed..7efe39c
--- 1/lib/quota/Makefile.in
--- 2/lib/quota/Makefile.in
+++ b/lib/quota/Makefile.in
@@@ -45,9 -44,7 +44,8 @@@ LIBDIR= quot
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 +      $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
  @PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
- @CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
  #ELF_CMT#     $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
  #BSDLIB_CMT#  $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
  

diff --cc lib/ss/Makefile.in
index 0647f6c,24c5e37..44edc0d
--- 1/lib/ss/Makefile.in
--- 2/lib/ss/Makefile.in
+++ b/lib/ss/Makefile.in
@@@ -35,9 -35,7 +35,8 @@@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmd
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $<
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 +      $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
  @PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
- @CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
  @ELF_CMT@     $(Q) $(CC) $(ALL_CFLAGS) -DSHARED_ELF_LIB -fPIC -o elfshared/$*.o -c $<
  @BSDLIB_CMT@  $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
  

diff --cc lib/uuid/Makefile.in
index f22ab26,74ca478..f51714b
--- 1/lib/uuid/Makefile.in
--- 2/lib/uuid/Makefile.in
+++ b/lib/uuid/Makefile.in
@@@ -63,9 -62,7 +62,8 @@@ BSDLIB_INSTALL_DIR = $(root_libdir
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 +      $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
  @PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
- @CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
  @ELF_CMT@     $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
  @BSDLIB_CMT@  $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
  

diff --cc misc/dumpe2fs.c
Simple merge

diff --cc misc/e2image.c
Simple merge

diff --cc misc/ext4.5.in
Simple merge

diff --cc misc/mke2fs.c
Simple merge

diff --cc misc/tune2fs.c
Simple merge

diff --cc resize/resize2fs.c
Simple merge

diff --cc util/subst.c
Simple merge