Merge branch 'stable/v2.13'; commit 'origin/master'

Conflicts:

	getopt/getopt.1

diff --cc fdisk/sfdisk.c
index c7319485137440a94131b59051bfcc30e84d4dad,1241f6622b6d4b41e9e5fdcf9c937c7804070480,99e165efaaccbee220b5452e9251ccaaf7f2431e..a3b66174f0fabcefc1f569ce1de470c97fa70b20
--- 1/fdisk/sfdisk.c
--- 2/fdisk/sfdisk.c
--- 3/fdisk/sfdisk.c
+++ b/fdisk/sfdisk.c
@@@@ -46,10 -46,8 -46,9 +46,9 @@@@
   #include <sys/ioctl.h>
   #include <sys/stat.h>
   #include <sys/utsname.h>
-- #include <linux/unistd.h>    /* _syscall */
   #include "nls.h"
 + #include "blkdev.h"
 + #include "linux_version.h"
   #include "common.h"
   
   #include "gpt.h"

diff --cc mount/Makefile.am
index 407a2aba18f76c36e050ab9fd149e71fec574349,41ae3fb0326684f2cd4216c292ea31d7efd0c699,6efc75543ea2d774e970930b2a9ef649fe850470..8b16baf099cbe0cfabd6c18a9570c25837579bf4
--- 1/mount/Makefile.am
--- 2/mount/Makefile.am
--- 3/mount/Makefile.am
+++ b/mount/Makefile.am
@@@@ -8,13 -8,12 -8,13 +8,13 @@@@ man_MANS = fstab.5 mount.8 swapoff.8 sw
   
   utils_common = sundries.c xmalloc.c realpath.c fsprobe.c
   
 - headers_common = fstab.h linux_fs.h mount_mntent.h mount_constants.h my_dev_t.h \
 -      mount_paths.h lomount.h fsprobe.h realpath.h xmalloc.h \
 + headers_common = fstab.h mount_mntent.h mount_constants.h \
-       mount_paths.h lomount.h fsprobe.h realpath.h xmalloc.h \
++      lomount.h fsprobe.h realpath.h xmalloc.h \
        getusername.h loop.h sundries.h
   
  -mount_common = fstab.c mount_mntent.c getusername.c lomount.c \
  +mount_common = fstab.c mount_mntent.c getusername.c lomount.c rmd160.c \
 -      $(utils_common) $(headers_common) ../lib/env.c
 +      $(utils_common) $(headers_common) ../lib/env.c ../lib/linux_version.c \
 +      ../lib/blkdev.c
   
   mount_SOURCES = mount.c $(mount_common) ../lib/setproctitle.c
   mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
@@@@ -26,8 -25,7 -26,8 +26,8 @@@@ umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_L
   
   swapon_SOURCES = swapon.c swap_constants.h $(utils_common)
   
 - losetup_SOURCES = lomount.c loop.h lomount.h rmd160.c
 + losetup_SOURCES = lomount.c sundries.c xmalloc.c realpath.c \
  -     loop.h lomount.h xmalloc.h sundries.h realpath.h
 ++     loop.h lomount.h xmalloc.h sundries.h realpath.h rmd160.c
   losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS)
   
   mount_LDADD = $(LDADD_common)

diff --cc mount/mount.c
index 72900190f76c8a372f2442eb2a8cbacc92f01367,6a154ae1a3cc562a43daf4a16c4820d10118ea99,99ad9703364004395298323fc3cebc19f3f7e76e..dd7c6b129fe3edd47fddbe0ef4e21f950ad9db9d
--- 1/mount/mount.c
--- 2/mount/mount.c
--- 3/mount/mount.c
+++ b/mount/mount.c
@@@@ -37,12 -37,11 -37,11 +37,11 @@@@
   #include "fstab.h"
   #include "lomount.h"
   #include "loop.h"
 - #include "linux_fs.h"                /* for BLKGETSIZE */
   #include "getusername.h"
-- #include "mount_paths.h"
   #include "env.h"
   #include "nls.h"
 + #include "blkdev.h"
 + #include "realpath.h"
   
   #define DO_PS_FIDDLING
   
@@@@ -62,14 -64,14 -61,8 +61,14 @@@@ static int nomtab = 0
   /* True for explicit readonly (-r).  */
   static int readonly = 0;
   
  +/* Nonzero for chatty (-v).  */
  +int verbose = 0;
  +
  +/* Do we hash the password or not */
  +int hash_pass = 1;
  +
   /* Nonzero for sloppy (-s).  */
 - int sloppy = 0;
 + static int sloppy = 0;
   
   /* True for explicit read/write (-w).  */
   static int readwrite = 0;
@@@@ -1676,9 -1640,13 -1660,8 +1675,9 @@@@ static struct option longopts[] = 
        { "options", 1, 0, 'o' },
        { "test-opts", 1, 0, 'O' },
        { "pass-fd", 1, 0, 'p' },
  +     { "keybits", 1, 0, 'k' },
        { "types", 1, 0, 't' },
        { "bind", 0, 0, 128 },
 -      { "replace", 0, 0, 129 },
 -      { "after", 0, 0, 130 },
 -      { "before", 0, 0, 131 },
 -      { "over", 0, 0, 132 },
        { "move", 0, 0, 133 },
        { "guess-fstype", 1, 0, 134 },
        { "rbind", 0, 0, 135 },
@@@@ -2009,9 -1994,8 -1989,7 +2009,9 @@@@ main(int argc, char *argv[]) 
                create_mtab ();
        }
   
  +     if (keysize && sscanf(keysize,"%d",&keysz) != 1)
  +             die (EX_USAGE, _("mount: argument to --keybits or -k must be a number"));
 +      atexit(unlock_mtab);
   
        switch (argc+specseen) {
        case 0:

diff --cc sys-utils/Makefile.am
Simple merge