Merge branch 'maint' into next

6 files changed, 29 insertions, 21 deletions

diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in
index d266d68ae..58c4e2bf8 100644
--- a/lib/e2p/Makefile.in
+++ b/lib/e2p/Makefile.in
@@ -159,6 +159,14 @@ ls.o: $(srcdir)/ls.c $(top_builddir)/lib/config.h \
  $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
  $(top_srcdir)/lib/support/dqblk_v2.h \
  $(top_srcdir)/lib/support/quotaio_tree.h
+ljs.o: $(srcdir)/ljs.c $(top_builddir)/lib/config.h \
+ $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
+ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(srcdir)/e2p.h $(top_srcdir)/lib/ext2fs/kernel-jbd.h \
+ $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h
 mntopts.o: $(srcdir)/mntopts.c $(top_builddir)/lib/config.h \
  $(top_builddir)/lib/dirpaths.h $(srcdir)/e2p.h \
  $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h
diff --git a/lib/uuid/uuid.3.in b/lib/uuid/uuid.3.in
index 18760fe3c..1c51bd067 100644
--- a/lib/uuid/uuid.3.in
+++ b/lib/uuid/uuid.3.in
@@ -35,10 +35,10 @@ uuid \- DCE compatible Universally Unique Identifier library
 .SH SYNOPSIS
 .B #include <uuid/uuid.h>
 .SH DESCRIPTION
-The UUID library is used to generate unique identifiers for objects 
+The UUID library is used to generate unique identifiers for objects
 that may be accessible beyond the local system.  This library
 generates UUIDs compatible with those created by the Open Software
-Foundation (OSF) Distributed Computing Environment (DCE) utility 
+Foundation (OSF) Distributed Computing Environment (DCE) utility
 .BR uuidgen .
 .sp
 The UUIDs generated by this library can be reasonably expected to be
diff --git a/lib/uuid/uuid_compare.3.in b/lib/uuid/uuid_compare.3.in
index 7f3296320..4807f3a8e 100644
--- a/lib/uuid/uuid_compare.3.in
+++ b/lib/uuid/uuid_compare.3.in
@@ -45,10 +45,10 @@ function compares the two supplied uuid variables
 .IR uu1 " and " uu2
 to each other.
 .SH RETURN VALUE
-Returns an integer less than, equal to, or greater than zero if 
+Returns an integer less than, equal to, or greater than zero if
 .I uu1
-is found,  respectively, to be lexigraphically less than, equal, or 
-greater than 
+is found,  respectively, to be lexigraphically less than, equal, or
+greater than
 .IR uu2 .
 .SH AUTHOR
 Theodore Y. Ts'o
diff --git a/lib/uuid/uuid_generate.3.in b/lib/uuid/uuid_generate.3.in
index 998e04298..f44900cde 100644
--- a/lib/uuid/uuid_generate.3.in
+++ b/lib/uuid/uuid_generate.3.in
@@ -44,18 +44,18 @@ uuid_generate, uuid_generate_random, uuid_generate_time \- create a new unique U
 The
 .B uuid_generate
 function creates a new universally unique identifier (UUID).  The uuid will
-be generated based on high-quality randomness from 
-.IR /dev/urandom , 
-if available.  If it is not available, then 
-.B uuid_generate 
+be generated based on high-quality randomness from
+.IR /dev/urandom ,
+if available.  If it is not available, then
+.B uuid_generate
 will use an alternative algorithm which uses the current time, the
 local ethernet MAC address (if available), and random data generated
 using a pseudo-random generator.
 .sp
-The 
+The
 .B uuid_generate_random
 function forces the use of the all-random UUID format, even if
-a high-quality random number generator (i.e., 
+a high-quality random number generator (i.e.,
 .IR /dev/urandom )
 is not available, in which case a pseudo-random
 generator will be subsituted.  Note that the use of a pseudo-random
@@ -63,7 +63,7 @@ generator may compromise the uniqueness of UUID's
 generated in this fashion.
 .sp
 The
-.B uuid_generate_time 
+.B uuid_generate_time
 function forces the use of the alternative algorithm which uses the
 current time and the local ethernet MAC address (if available).
 This algorithm used to be the default one used to generate UUID, but
@@ -72,7 +72,7 @@ information about when and where the UUID was generated.  This can cause
 privacy problems in some applications, so the
 .B uuid_generate
 function only uses this algorithm if a high-quality source of
-randomness is not available.  
+randomness is not available.
 .sp
 The UUID is 16 bytes (128 bits) long, which gives approximately 3.4x10^38
 unique values (there are approximately 10^80 elemntary particles in
diff --git a/lib/uuid/uuid_time.3.in b/lib/uuid/uuid_time.3.in
index 2a4c7000e..2c8ef5b79 100644
--- a/lib/uuid/uuid_time.3.in
+++ b/lib/uuid/uuid_time.3.in
@@ -43,9 +43,9 @@ The
 .B uuid_time
 function extracts the time at which the supplied time-based UUID
 .I uu
-was created.  Note that the UUID creation time is only encoded within 
-certain types of UUIDs.  This function can only reasonably expect to 
-extract the creation time for UUIDs created with the 
+was created.  Note that the UUID creation time is only encoded within
+certain types of UUIDs.  This function can only reasonably expect to
+extract the creation time for UUIDs created with the
 .BR uuid_generate_time (3)
 function.  It may or may not work with UUIDs created by other mechanisms.
 .SH "RETURN VALUES"
diff --git a/lib/uuid/uuid_unparse.3.in b/lib/uuid/uuid_unparse.3.in
index 0e8384515..e8ca9de5f 100644
--- a/lib/uuid/uuid_unparse.3.in
+++ b/lib/uuid/uuid_unparse.3.in
@@ -46,18 +46,18 @@ The
 function converts the supplied UUID
 .I uu
 from the binary representation into a 36\-byte string (plus tailing '\\0')
-of the form 1b4e28ba\-2fa1\-11d2\-883f\-0016d3cca427 and stores this 
+of the form 1b4e28ba\-2fa1\-11d2\-883f\-0016d3cca427 and stores this
 value in the character string pointed to by
-.IR out .  
-The case of the hex digits returned by 
+.IR out .
+The case of the hex digits returned by
 .B uuid_unparse
 may be upper or lower case, and is
-dependent on the system-dependent local default.  
+dependent on the system-dependent local default.
 .PP
 If the case of the
 hex digits is important then the functions
 .B uuid_unparse_upper
-and 
+and
 .B uuid_unparse_lower
 may be used.
 .SH "CONFORMING TO"