Merge branch 'maint' into next

Conflicts:
	configure
	configure.in
	misc/mke2fs.c

diff --cc configure
index fd60056,3d6c5c8..046c108
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -15770,10 -15860,7 +15860,10 @@@ f
  
  
  
 -for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit blkid_probe_get_topology2
 +
 +
 +
- for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate
++for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate blkid_probe_get_topology2
  do
  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
  { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5

diff --cc configure.in
index 4bb5b08,eeeccec..c278d83
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -802,7 -802,14 +802,14 @@@ AC_CHECK_MEMBER(struct sockaddr.sa_len
        [#include <sys/types.h>
         #include <sys/socket.h>])
  dnl
- AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate)
+ dnl This will add -lblkid to the AC_CHECK_FUNCS search if we are using
+ dnl the system-provided blkid library
+ dnl
+ if test -n "$BLKID_CMT"; then
+   AC_SEARCH_LIBS([blkid_probe_all], [blkid])
+ fi
+ dnl
 -AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit blkid_probe_get_topology2)
++AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate blkid_probe_get_topology2)
  dnl
  dnl Check to see if -lsocket is required (solaris) to make something
  dnl that uses socket() to compile; this is needed for the UUID library

diff --cc debugfs/debugfs.c
Simple merge

diff --cc e2fsck/message.c
Simple merge

diff --cc e2fsck/super.c
Simple merge

diff --cc lib/ext2fs/Makefile.in
Simple merge

diff --cc lib/ext2fs/tst_badblocks.c
Simple merge

diff --cc misc/Makefile.in
Simple merge

diff --cc misc/e2undo.c
Simple merge

diff --cc misc/mke2fs.c
index cd97b93,f86d6e7..2d9107a
--- 1/misc/mke2fs.c
--- 2/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@@ -49,9 -49,9 +49,10 @@@ extern int optind
  #include <sys/types.h>
  #include <libgen.h>
  #include <limits.h>
+ #include <blkid/blkid.h>
  
  #include "ext2fs/ext2_fs.h"
 +#include "ext2fs/ext2fsP.h"
  #include "et/com_err.h"
  #include "uuid/uuid.h"
  #include "e2p/e2p.h"
@@@ -558,11 -615,13 +559,13 @@@ static void show_stats(ext2_filsys fs
                s->s_log_block_size);
        printf(_("Fragment size=%u (log=%u)\n"), fs->fragsize,
                s->s_log_frag_size);
 -      printf(_("%u inodes, %u blocks\n"), s->s_inodes_count,
 -             s->s_blocks_count);
 -      printf(_("%u blocks (%2.2f%%) reserved for the super user\n"),
 -              s->s_r_blocks_count,
 -             100.0 * s->s_r_blocks_count / s->s_blocks_count);
+       printf(_("Stride=%u blocks, Stripe width=%u blocks\n"),
+              s->s_raid_stride, s->s_raid_stripe_width);
 +      printf(_("%u inodes, %llu blocks\n"), s->s_inodes_count,
 +             ext2fs_blocks_count(s));
 +      printf(_("%llu blocks (%2.2f%%) reserved for the super user\n"),
 +              ext2fs_r_blocks_count(s),
 +             100.0 *  ext2fs_r_blocks_count(s) / ext2fs_blocks_count(s));
        printf(_("First data block=%u\n"), s->s_first_data_block);
        if (s->s_reserved_gdt_blocks)
                printf(_("Maximum filesystem blocks=%lu\n"),

diff --cc tests/f_resize_inode/expect
Simple merge

diff --cc tests/m_dasd_bs/expect.1
Simple merge

diff --cc tests/m_large_file/expect.1
Simple merge

diff --cc tests/m_meta_bg/expect.1
Simple merge

diff --cc tests/m_no_opt/expect.1
Simple merge

diff --cc tests/m_raid_opt/expect.1
Simple merge

diff --cc tests/m_std/expect.1
Simple merge

diff --cc tests/m_uninit/expect.1
Simple merge