Whamcloud - gitweb
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Tue, 29 Aug 2017 12:03:31 +0000 (08:03 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 29 Aug 2017 12:03:31 +0000 (08:03 -0400)
13 files changed:
1  2 
configure
configure.ac
e2fsck/e2fsck.h
e2fsck/message.c
e2fsck/pass1.c
lib/blkid/devname.c
lib/ext2fs/Makefile.in
lib/ext2fs/ext2fs.h
lib/ext2fs/unix_io.c
misc/mke2fs.c
misc/tune2fs.c
tests/Makefile.in
tests/test_one.in

diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
diff --cc e2fsck/e2fsck.h
Simple merge
Simple merge
diff --cc e2fsck/pass1.c
Simple merge
Simple merge
@@@ -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 \
Simple merge
Simple merge
diff --cc misc/mke2fs.c
Simple merge
diff --cc misc/tune2fs.c
Simple merge
Simple merge
Simple merge