Merge commit 'origin/master'

Conflicts:

	mount/mount.8

diff --cc mount/mount.8
index 02d2b7fe9da6c4aca4abb536bdabff99213f168f,ce52dd84dde73e4a68bfc19df5e13c84010c5fd4..ac0eeef720f3d3e8a2810cb90b968b59ca571886
--- 1/mount/mount.8
--- 2/mount/mount.8
+++ b/mount/mount.8
@@@ -615,14 -615,8 +615,16 @@@ This option implies the option
  (unless overridden by subsequent options, as in the option line
  .BR group,dev,suid ).
  .TP
 +.B encryption
 +Specifies an encryption algorithm to use.  Used in conjunction with the
 +.BR loop " option."
 +.TP
 +.B keybits
 +Specifies the key size to use for an encryption algorithm. Used in conjunction
 +with the 
 +.BR loop " and " encryption " options."
+ .B nofail
+ Do not report errors for this device if it does not exist.
  .TP
  .B mand
  Allow mandatory locks on this filesystem. See

diff --cc mount/mount.c
index e9615104093aae1a66b9f2e921a195c09d0c51d9,0688c57ff58f78dcad86b3707021b1175f684ee6..66351159715883e1be39f2d5f3210d312843d237
--- 1/mount/mount.c
--- 2/mount/mount.c
+++ b/mount/mount.c
@@@ -188,9 -180,10 +189,11 @@@ static const struct opt_map opt_map[] 
    { NULL,     0, 0, 0         }
  };
  
+ static int opt_nofail = 0;
+ 
  static const char *opt_loopdev, *opt_vfstype, *opt_offset, *opt_encryption,
        *opt_speed, *opt_comment, *opt_uhelper;
 +static const char *opt_keybits, *opt_nohashpass;
  
  static int mounted (const char *spec0, const char *node0);
  static int check_special_mountprog(const char *spec, const char *node,