Merge branch 'maint' into next

diff --cc MCONFIG.in
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc debugfs/set_fields.c
Simple merge

diff --cc e2fsck/Makefile.in
Simple merge

diff --cc lib/e2p/Makefile.in
Simple merge

diff --cc misc/Makefile.in
Simple merge

diff --cc misc/filefrag.c
Simple merge

diff --cc resize/Makefile.in
Simple merge

diff --cc resize/main.c
Simple merge