Merge commit 'v2.17.1' into stable/v2.17

Conflicts:
	tests/ts/blkid/images-fs/adaptec-raid.img.bz2
	tests/ts/blkid/images-fs/ddf-raid.img.bz2
	tests/ts/blkid/images-fs/gfs2.img.bz2
	tests/ts/blkid/images-fs/hpt37x-raid.img.bz2
	tests/ts/blkid/images-fs/isw-raid.img.bz2
	tests/ts/blkid/images-fs/jbd.img.bz2
	tests/ts/blkid/images-fs/jmicron-raid.img.bz2
	tests/ts/blkid/images-fs/lvm2.img.bz2
	tests/ts/blkid/images-fs/nvidia-raid.img.bz2
	tests/ts/blkid/images-fs/ocfs2.img.bz2
	tests/ts/blkid/images-fs/promise-raid.img.bz2
	tests/ts/blkid/images-fs/reiser4.img.bz2
	tests/ts/blkid/images-fs/romfs.img.bz2
	tests/ts/blkid/images-fs/silicon-raid.img.bz2
	tests/ts/blkid/images-fs/swap0.img.bz2
	tests/ts/blkid/images-fs/swap1.img.bz2
	tests/ts/blkid/images-fs/via-raid.img.bz2
	tests/ts/blkid/images-fs/vmfs_volume.img.bz2
	tests/ts/blkid/images-fs/zfs.img.bz2

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

diff --cc mount/mount.8
Simple merge

diff --cc mount/mount.c
index dc20bedc42828cc8ee68e99e28323e875dca1ae2,efe1165424d1febfdf2a0bde18b6cdeaac921086..0823bb59f1f2f1c1c4904812e2077eb7e112209a
--- 1/mount/mount.c
--- 2/mount/mount.c
+++ b/mount/mount.c
@@@ -209,8 -200,8 +209,9 @@@ static int opt_nofail = 0
  
  static const char *opt_loopdev, *opt_vfstype, *opt_offset, *opt_sizelimit,
          *opt_encryption, *opt_speed, *opt_comment, *opt_uhelper;
 +static const char *opt_keybits, *opt_nohashpass;
  
+ static int is_readonly(const char *node);
  static int mounted (const char *spec0, const char *node0);
  static int check_special_mountprog(const char *spec, const char *node,
                const char *type, int flags, char *extra_opts, int *status);