git://git.whamcloud.com - tools/e2fsprogs.git/commit

Whamcloud - gitweb

git://git.whamcloud.com / tools / e2fsprogs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9a32973 1dd48bc)

author	Theodore Ts'o <tytso@mit.edu>
	Thu, 1 Oct 2020 21:13:27 +0000 (17:13 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Thu, 1 Oct 2020 21:13:27 +0000 (17:13 -0400)
commit	7b8253ba09e635d328a48c98a184b571b809911b
tree	db21ee5a31bc251d526370e707a50e6835f320f5	tree \| snapshot
parent	9a32973bd15b62d69cc311e108282c412bc9c435	commit \| diff
parent	1dd48bc23c3776df76459aff0c7723fff850ea45	commit \| diff

Merge branch 'maint' into next

12 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
debugfs/debugfs.c	diff1 \|	diff2 \|	blob \| history
e2fsck/e2fsck.h	diff1 \|	diff2 \|	blob \| history
e2fsck/pass1.c	diff1 \|	diff2 \|	blob \| history
e2fsck/unix.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/csum.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/ext2_fs.h	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/imager.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/openfs.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/swapfs.c	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.c	diff1 \|	diff2 \|	blob \| history
misc/tune2fs.c	diff1 \|	diff2 \|	blob \| history

Mirror of git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git