Merge branch 'stable/v2.14'

Conflicts:

	fdisk/fdisk.c
	fdisk/partname.c
	include/blkdev.h
	mount/fstab.c
	mount/lomount.c
	mount/mount.8
	mount/umount.c
	schedutils/chrt.c
	schedutils/ionice.1
	sys-utils/Makefile.am
	sys-utils/ipcs.c
	sys-utils/rtcwake.c

diff --cc configure.ac
Simple merge

diff --cc mount/Makefile.am
index 70bd1ba38e8081c5da8e527644cf59966f591cbc,e83dbb712f6026c3367c53c57172dbeeddd020dc..acaf848cd028e5349cf0efcb878056abc5ec4057
--- 1/mount/Makefile.am
--- 2/mount/Makefile.am
+++ b/mount/Makefile.am
@@@ -24,13 -29,13 +29,14 @@@ umount_SOURCES = umount.c $(mount_commo
  umount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
  umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
  
 -swapon_SOURCES = swapon.c swap_constants.h $(utils_common)
 +swapon_SOURCES = swapon.c swap_constants.h $(utils_common) \
 +      ../lib/linux_version.c ../lib/blkdev.c
  
  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 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
index 7371c4ea15d3dcfd3dd5b4fb67f24047d47f56c8,f80ec72da327683455ff54943e6a77d1b393f360..b7f32b7ea0638d4d577691a1861cd75caed92f71
--- 1/mount/lomount.c
--- 2/mount/lomount.c
+++ b/mount/lomount.c
@@@ -24,8 -25,11 +24,12 @@@
  #include "sundries.h"
  #include "xmalloc.h"
  #include "realpath.h"
 +#include "pathnames.h"
  
+ #ifndef HAVE_VERSIONSORT
+ # include "strverscmp.h"
+ #endif
+ 
  #define SIZE(a) (sizeof(a)/sizeof(a[0]))
  
  #ifdef LOOP_SET_FD

diff --cc mount/mount.8
index c11df15d390afc3e93b1b6ebd6c1c9c1f2bb547c,93eefc4a677469daa3268c742107f0ddd0eb85f3..0c5166ffde813fa6c13d01023549a43276db8b79
--- 1/mount/mount.8
--- 2/mount/mount.8
+++ b/mount/mount.8
@@@ -191,6 -176,6 +191,22 @@@ mounts under a given mountpoint
  .fi
  .RE
  .RE
++.RE
++
++.B The device indication.
++.RS
++Most devices are indicated by a file name (of a block special device), like
++.IR /dev/sda1 ,
++but there are other possibilities. For example, in the case of an NFS mount,
++.I device
++may look like
++.IR knuth.cwi.nl:/dir .
++It is possible to indicate a block special device using its
++volume
++.B LABEL
++or
++.B UUID
++(see the \-L and \-U options below).
  
  .B The device indication.
  .RS

diff --cc mount/mount.c
Simple merge