Merge commit 'origin/stable/v2.14' into stable/v2.14

Conflicts:

	mount/mount.8

diff --cc NEWS
Simple merge

diff --cc mount/Makefile.am
Simple merge

diff --cc mount/lomount.c
index 807c14601fcb1c86b0d364514187e00ce792f8b2,f1d74820ad4625393f5eb12e05680bc23ce30271..f80ec72da327683455ff54943e6a77d1b393f360
--- 1/mount/lomount.c
--- 2/mount/lomount.c
+++ b/mount/lomount.c
@@@ -634,10 -633,15 +634,16 @@@ digits_only(const char *s) 
        return 1;
  }
  
+ /*
+  * return codes:
+  *    0       - success
+  *    1       - error
+  *    2       - error (EBUSY)
+  */
  int
  set_loop(const char *device, const char *file, unsigned long long offset,
 -       unsigned long long sizelimit, const char *encryption, int pfd, int *options) {
 +       unsigned long long sizelimit, const char *encryption, int pfd, int *options,
 +       int keysz, int hash_pass) {
        struct loop_info64 loopinfo64;
        int fd, ffd, mode, i;
        char *pass;
@@@ -1098,13 -1021,11 +1108,13 @@@ main(int argc, char **argv) 
        else {
                if (passfd && sscanf(passfd, "%d", &pfd) != 1)
                        usage();
 +              if (keysize && sscanf(keysize,"%d",&keysz) != 1)
 +                      usage();
                do {
 -                      res = set_loop(device, file, off, slimit, encryption, pfd, &ro);
 +                      res = set_loop(device, file, off, slimit, encryption, pfd, &ro, keysz, hash_pass);
                        if (res == 2 && find) {
                                if (verbose)
-                                       printf("stolen loop=%s...trying again\n",
+                                       printf(_("stolen loop=%s...trying again\n"),
                                                device);
                                free(device);
                                if (!(device = find_unused_loop_device()))

diff --cc mount/mount.8
index 39e84f5bebc64972858198c10cd0d2f68aefbb6c,1a26c111111f19d151da4323d9004d788de5bd0e..93eefc4a677469daa3268c742107f0ddd0eb85f3
--- 1/mount/mount.8
--- 2/mount/mount.8
+++ b/mount/mount.8
@@@ -615,16 -761,11 +761,21 @@@ 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.
+ .B iversion
+ Every time the inode is modified, the i_version field will be incremented.
+ .TP
+ .B noiversion
+ Do not increment the i_version inode field.
  .TP
  .B mand
  Allow mandatory locks on this filesystem. See

diff --cc mount/mount.c
Simple merge