From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 29 Aug 2017 12:03:31 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.44.0-rc1~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58a31b508e2cc520565d5de20c9087ac36923164;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next
---

58a31b508e2cc520565d5de20c9087ac36923164
diff --cc lib/ext2fs/Makefile.in
index b6b0f855c,cf2c045f2..b729f619d
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@@ -1109,13 -1108,7 +1110,13 @@@ unix_io.o: $(srcdir)/unix_io.c $(top_bu
   $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
   $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
   $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-  $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h
+  $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h $(srcdir)/ext2fsP.h
 +sparse_io.o: $(srcdir)/sparse_io.c $(top_builddir)/lib/config.h \
 + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
 + $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
 + $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
 + $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
 + $(srcdir)/ext2_ext_attr.h $(srcdir)/bitops.h
  unlink.o: $(srcdir)/unlink.c $(top_builddir)/lib/config.h \
   $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
   $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \