Merge commit 'origin/master'

Conflicts:

	mount/Makefile.am
	mount/my_dev_t.h

diff --cc fdisk/sfdisk.c
Simple merge

diff --cc mount/Makefile.am
index f4430009aea7bd273a94b9ce6fdaea5ee232f060,4ba8f56f6dce3df1eeaeed48ab874db79634618f..c4c3902400c6f562e8b3e5bb7469dad4ed42c683
--- 1/mount/Makefile.am
--- 2/mount/Makefile.am
+++ b/mount/Makefile.am
@@@ -12,8 -12,9 +12,9 @@@ headers_common = fstab.h mount_mntent.
        mount_paths.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)

diff --cc mount/mount.c
index 43824c3534396b97b9412c6d5d79a8a2a2d854da,7a6ae004a95a225cb6b27a74dfc2e1d4b37dbbc2..86b751bef23fa1d000da360ca7738b38d512dd38
--- 1/mount/mount.c
--- 2/mount/mount.c
+++ b/mount/mount.c
@@@ -1685,13 -1658,8 +1673,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 },

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

diff --cc sys-utils/setarch.c
Simple merge