Whamcloud - gitweb
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Mon, 7 Mar 2016 01:37:49 +0000 (20:37 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 7 Mar 2016 01:37:49 +0000 (20:37 -0500)
1  2 
Makefile.in
debugfs/debugfs.8.in
debugfs/debugfs.c
lib/blkid/probe.c
lib/e2p/fgetversion.c
lib/ext2fs/tdb.c
misc/findsuper.c
misc/lsattr.c
misc/util.c
tests/Makefile.in
util/subst.c

diff --cc Makefile.in
@@@ -34,6 -34,7 +34,7 @@@ subs: $(DEP_SUBSTITUTE
                then $(MAKE) $$i || exit $$? ; fi ; done
        @(if test -d lib/et ; then cd lib/et && $(MAKE) compile_et; fi)
        @(if test -d lib/ext2fs ; then cd lib/ext2fs && $(MAKE) ext2_err.h; fi)
 -      @(if test -d e2fsck ; then cd e2fsck && $(MAKE) prof_err.h; fi)
++      @(if test -d lib/support ; then cd lib/support && $(MAKE) prof_err.h; fi)
  
  progs: all-progs-recursive
  libs: all-libs-recursive
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc misc/lsattr.c
Simple merge
diff --cc misc/util.c
Simple merge
Simple merge
diff --cc util/subst.c
Simple merge