Merge branch 'maint' into next

Conflicts:
	misc/mke2fs.c

diff --cc misc/mke2fs.c
index 718e273,e28828e..0b7487f
--- 1/misc/mke2fs.c
--- 2/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@@ -2136,9 -2142,10 +2136,9 @@@ int main (int argc, char *argv[]
        }
  
        /* Can't undo discard ... */
-       if (discard && (io_ptr != undo_io_manager)) {
+       if (!noaction && discard && (io_ptr != undo_io_manager)) {
 -              retval = mke2fs_discard_blocks(fs);
 -
 -              if (!retval && mke2fs_discard_zeroes_data(fs)) {
 +              retval = mke2fs_discard_device(fs);
 +              if (!retval && io_channel_discard_zeroes_data(fs->io)) {
                        if (verbose)
                                printf(_("Discard succeeded and will return 0s "
                                         " - skipping inode table wipe\n"));