Merge branch 'maint' into next

diff --cc e2fsck/pass1.c
Simple merge

diff --cc e2fsck/problem.c
index 4863ea7,5eb5973..27c6957
--- 1/e2fsck/problem.c
--- 2/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@@ -1240,12 -1243,16 +1243,22 @@@ static struct e2fsck_problem problem_ta
          N_("EA @i %N for parent @i %i missing EA_INODE flag.\n "),
          PROMPT_FIX, PR_PREEN_OK, 0, 0, 0 },
  
 +      /* Offer to clear uninitialized flag on an extent */
 +      { PR_1_CLEAR_UNINIT_EXTENT,
 +        /* xgettext:no-c-format */
 +        N_("@i %i has @x marked uninitialized at @b %c (len %N).  "),
 +        PROMPT_CLEAR, PR_PREEN_OK, 0, 0, 0 },
 +
+       /* Casefold flag set on a non-directory */
+       { PR_1_CASEFOLD_NONDIR,
+         N_("@i %i has the casefold flag set but is not a directory.  "),
+         PROMPT_CLEAR_FLAG, 0, 0, 0, 0 },
+ 
+       /* Casefold flag set, but file system is missing the casefold feature */
+       { PR_1_CASEFOLD_FEATURE,
+         N_("@d %p has the casefold flag, but the\ncasefold feature is not enabled.  "),
+         PROMPT_CLEAR_FLAG, 0, 0, 0, 0 },
+ 
        /* Pass 1b errors */
  
        /* Pass 1B: Rescan for duplicate/bad blocks */