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

Conflicts:

	mount/Makefile.am

diff --cc mount/Makefile.am
index 3592eb2a355af17e803688d8b3e2fca5dbf267ae,43b3d6d811724e5c001fedfef88f953f5287d2b9..70422495cebac096945f05046665023005bf1092
--- 1/mount/Makefile.am
--- 2/mount/Makefile.am
+++ b/mount/Makefile.am
@@@ -12,9 -16,10 +16,10 @@@ headers_common = fstab.h mount_mntent.
        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 ../lib/linux_version.c \
-       ../lib/blkdev.c
+       ../lib/blkdev.c $(fallback)
+ 
  
  mount_SOURCES = mount.c $(mount_common) ../lib/setproctitle.c
  mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
@@@ -27,9 -32,10 +32,10 @@@ umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_L
  swapon_SOURCES = swapon.c swap_constants.h $(utils_common)
  
  losetup_SOURCES = lomount.c sundries.c xmalloc.c realpath.c \
-       loop.h lomount.h xmalloc.h sundries.h realpath.h rmd160.c
 -      loop.h lomount.h xmalloc.h sundries.h realpath.h $(fallback)
++      loop.h lomount.h xmalloc.h sundries.h realpath.h rmd160.c $(fallback)
  losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS)
  
+ 
  mount_LDADD = $(LDADD_common)
  umount_LDADD = $(LDADD_common)
  swapon_LDADD = $(LDADD_common)

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