Merge branch 'maint'

diff --cc debugfs/util.c
Simple merge

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

diff --cc e2fsck/unix.c
index 7b662e4,d3a8a2b..deec442
--- 1/e2fsck/unix.c
--- 2/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@@ -732,8 -737,22 +736,8 @@@ static errcode_t PRS(int argc, char *ar
                        break;
  #endif
                case 'N':
-                       ctx->device_name = optarg;
+                       ctx->device_name = string_copy(ctx, optarg, 0);
                        break;
 -#ifdef ENABLE_SWAPFS
 -              case 's':
 -                      normalize_swapfs = 1;
 -              case 'S':
 -                      swapfs = 1;
 -                      break;
 -#else
 -              case 's':
 -              case 'S':
 -                      fprintf(stderr, _("Byte-swapping filesystems "
 -                                        "not compiled in this version "
 -                                        "of e2fsck\n"));
 -                      exit(1);
 -#endif
                case 'k':
                        keep_bad_blocks++;
                        break;

diff --cc misc/fsck.c
Simple merge

diff --cc misc/mke2fs.8.in
Simple merge

diff --cc misc/tune2fs.8.in
Simple merge

diff --cc misc/tune2fs.c
Simple merge