Merge branch 'progs-cleanup' into for-next

diff --cc db/btblock.c
Simple merge

diff --cc db/check.c
Simple merge

diff --cc db/field.c
Simple merge

diff --cc db/field.h
Simple merge

diff --cc db/init.c
Simple merge

diff --cc db/metadump.c
Simple merge

diff --cc db/sb.c
Simple merge

diff --cc db/type.c
Simple merge

diff --cc growfs/xfs_growfs.c
Simple merge

diff --cc include/libxfs.h
Simple merge

diff --cc libxfs/Makefile
Simple merge

diff --cc libxfs/libxfs_priv.h
Simple merge

diff --cc libxfs/util.c
Simple merge

diff --cc libxfs/xfs_bmap.c
Simple merge

diff --cc libxfs/xfs_sb.c
Simple merge

diff --cc mkfs/xfs_mkfs.c
Simple merge

diff --cc repair/dino_chunks.c
Simple merge

diff --cc repair/incore_ino.c
Simple merge

diff --cc repair/phase5.c
Simple merge

diff --cc repair/prefetch.c
Simple merge

diff --cc repair/sb.c
Simple merge

diff --cc repair/scan.c
Simple merge

diff --cc repair/xfs_repair.c
Simple merge