Merge branch 'maint' into next

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge

diff --cc e2fsck/e2fsck.h
Simple merge

diff --cc e2fsck/message.c
Simple merge

diff --cc e2fsck/pass1.c
Simple merge

diff --cc e2fsck/problem.c
Simple merge

diff --cc e2fsck/problem.h
Simple merge

diff --cc lib/ext2fs/flushb.c
index fe1d3e7,1b9c671..bb7daf4
--- 1/lib/ext2fs/flushb.c
--- 2/lib/ext2fs/flushb.c
+++ b/lib/ext2fs/flushb.c
@@@ -58,12 -58,11 +58,13 @@@ errcode_t ext2fs_sync_device(int fd, in
         * still is a race condition for those kernels, but this
         * reduces it greatly.)
         */
 +#if defined(HAVE_FSYNC)
        if (fsync (fd) == -1)
                return errno;
 +#endif
  
        if (flushb) {
+               errcode_t       retval = 0;
  
  #ifdef BLKFLSBUF
                if (ioctl (fd, BLKFLSBUF, 0) == 0)

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

diff --cc misc/Makefile.in
Simple merge