Merge commit 'origin/master'

Conflicts:

	mount/mount.c

diff --cc hwclock/hwclock.8
Simple merge

diff --cc misc-utils/whereis.c
Simple merge

diff --cc mount/lomount.c
Simple merge

diff --cc mount/lomount.h
index 7d548b5a75cab0fc96d180e522760c4cdad265f1,59108d4085683ee1c0de6d487669fc5bfbfa9ca8..d24d8b62c2be14acdba7eba9aa71ad18c6320ddf
--- 1/mount/lomount.h
--- 2/mount/lomount.h
+++ b/mount/lomount.h
@@@ -1,7 -1,8 +1,8 @@@
  extern int set_loop(const char *, const char *, unsigned long long, unsigned long long,
 -                  const char *, int, int *);
 +                  const char *, int, int *, int, int);
  extern int del_loop(const char *);
  extern int is_loop_device(const char *);
+ extern int is_loop_autoclear(const char *device);
  extern char * find_unused_loop_device(void);
  
  extern int loopfile_used_with(char *devname, const char *filename, unsigned long long offset);

diff --cc mount/mount.8
Simple merge

diff --cc mount/mount.c
index 62b890686c4e901772fc932a4a9b24be3d3fefd9,be051355b9091503c18ebbe12a24a6e11ebdf63c..9bacda1751719708f57f7dcff21c5980fb0944a8
--- 1/mount/mount.c
--- 2/mount/mount.c
+++ b/mount/mount.c
@@@ -1665,12 -1683,11 +1698,12 @@@ 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 },
-       { "move", 0, 0, 133 },
+       { "bind", 0, 0, 'B' },
+       { "move", 0, 0, 'M' },
        { "guess-fstype", 1, 0, 134 },
-       { "rbind", 0, 0, 135 },
+       { "rbind", 0, 0, 'R' },
        { "make-shared", 0, 0, 136 },
        { "make-slave", 0, 0, 137 },
        { "make-private", 0, 0, 138 },
@@@ -1858,7 -1874,7 +1891,7 @@@ main(int argc, char *argv[]) 
        initproctitle(argc, argv);
  #endif
  
-       while ((c = getopt_long (argc, argv, "afFhik:lL:no:O:p:rsU:vVwt:",
 -      while ((c = getopt_long (argc, argv, "aBfFhilL:Mno:O:p:rRsU:vVwt:",
++      while ((c = getopt_long (argc, argv, "aBfFhik:lL:Mno:O:p:rRsU:vVwt:",
                                 longopts, NULL)) != -1) {
                switch (c) {
                case 'a':              /* mount everything in fstab */