Merge branch 'maint' into next

diff --cc lib/ext2fs/progress.c
index c71d695,8c9a6f1..83556b1
--- 1/lib/ext2fs/progress.c
--- 2/lib/ext2fs/progress.c
+++ b/lib/ext2fs/progress.c
@@@ -17,13 -17,8 +17,14 @@@
  #include <time.h>
  
  static char spaces[80], backspaces[80];
+ static time_t last_update;
  
 +struct ext2fs_progress_ops ext2fs_numeric_progress_ops = {
 +      .init           = ext2fs_numeric_progress_init,
 +      .update         = ext2fs_numeric_progress_update,
 +      .close          = ext2fs_numeric_progress_close,
 +};
 +
  static int int_log10(unsigned int arg)
  {
        int     l;

diff --cc misc/mke2fs.c
Simple merge