Merge branch 'progs-misc-fixes-2' into for-next

Conflicts:
	copy/xfs_copy.c

diff --cc copy/xfs_copy.c
Simple merge

diff --cc db/sb.c
Simple merge

diff --cc libxfs/util.c
Simple merge

diff --cc libxfs/xfs_ialloc.c
Simple merge

diff --cc libxfs/xfs_sb.c
Simple merge

diff --cc libxlog/util.c
Simple merge

diff --cc man/man8/xfs_admin.8
Simple merge

diff --cc mkfs/xfs_mkfs.c
Simple merge

diff --cc repair/agheader.c
Simple merge

diff --cc repair/dinode.c
Simple merge

diff --cc repair/incore_ext.c
Simple merge

diff --cc repair/phase5.c
Simple merge

diff --cc repair/phase6.c
Simple merge

diff --cc repair/scan.c
Simple merge