Merge branch 'maint' into next

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge

diff --cc debugfs/debugfs.c
Simple merge

diff --cc debugfs/ls.c
Simple merge

diff --cc e2fsck/pass1.c
Simple merge