Merge branch 'maint' into next

diff --cc .gitignore
Simple merge

diff --cc e2fsck/e2fsck.h
Simple merge

diff --cc lib/blkid/list.h
Simple merge

diff --cc misc/e2freefrag.c
index c5aeab9dfb67fedf2b642e6d14e795eba828a0a0,4df6903df2755deb41a567498ea9cb75f9b6f0bd..09fae5c2a64497d97e9896ac3c1260132dfef8eb
--- 1/misc/e2freefrag.c
--- 2/misc/e2freefrag.c
+++ b/misc/e2freefrag.c
@@@ -37,13 -30,10 +37,17 @@@ extern int optind
  #include "ext2fs/ext2fs.h"
  #include "e2freefrag.h"
  
 +#if defined(HAVE_EXT2_IOCTLS) && !defined(DEBUGFS)
 +# ifdef HAVE_LINUX_FSMAP_H
 +#  include <linux/fsmap.h>
 +# endif
 +# include "fsmap.h"
 +#endif
 +
+ #ifndef PATH_MAX
+ #define PATH_MAX 4096
+ #endif
+ 
  static void usage(const char *prog)
  {
        fprintf(stderr, "usage: %s [-c chunksize in kb] [-h] "