Merge branch 'master' into next

Conflicts:
	e2fsck/e2fsck.h
	e2fsck/unix.c

diff --cc e2fsck/e2fsck.8.in
Simple merge

diff --cc e2fsck/e2fsck.h
index d8038a5,a377246..486a71b
--- 1/e2fsck/e2fsck.h
--- 2/e2fsck/e2fsck.h
+++ b/e2fsck/e2fsck.h
@@@ -155,7 -155,7 +155,8 @@@ struct resource_track 
  #define E2F_OPT_WRITECHECK    0x0200
  #define E2F_OPT_COMPRESS_DIRS 0x0400
  #define E2F_OPT_FRAGCHECK     0x0800
 -#define E2F_OPT_DISCARD               0x1000
 +#define E2F_OPT_JOURNAL_ONLY  0x1000 /* only replay the journal */
++#define E2F_OPT_DISCARD               0x2000
  
  /*
   * E2fsck flags

diff --cc e2fsck/unix.c
index bb492d4,4cf55a9..73cc2cf
--- 1/e2fsck/unix.c
--- 2/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@@ -598,12 -594,12 +598,18 @@@ static void parse_extended_opts(e2fsck_
                } else if (strcmp(token, "fragcheck") == 0) {
                        ctx->options |= E2F_OPT_FRAGCHECK;
                        continue;
 +              } else if (strcmp(token, "journal_only") == 0) {
 +                      if (arg) {
 +                              extended_usage++;
 +                              continue;
 +                      }
 +                      ctx->options |= E2F_OPT_JOURNAL_ONLY;
+               } else if (strcmp(token, "discard") == 0) {
+                       ctx->options |= E2F_OPT_DISCARD;
+                       continue;
+               } else if (strcmp(token, "nodiscard") == 0) {
+                       ctx->options &= ~E2F_OPT_DISCARD;
+                       continue;
                } else {
                        fprintf(stderr, _("Unknown extended option: %s\n"),
                                token);
@@@ -619,7 -615,8 +625,9 @@@
                       "Valid extended options are:\n"), stderr);
                fputs(("\tea_ver=<ea_version (1 or 2)>\n"), stderr);
                fputs(("\tfragcheck\n"), stderr);
 +              fputs(("\tjournal_only\n"), stderr);
+               fputs(("\tdiscard\n"), stderr);
+               fputs(("\tnodiscard\n"), stderr);
                fputc('\n', stderr);
                exit(1);
        }

diff --cc misc/mke2fs.c
Simple merge