Merge branch 'xfs-generic-sb-counters' into for-next

Conflicts:
	fs/xfs/xfs_super.c

diff --cc fs/xfs/libxfs/xfs_bmap.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_ialloc.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_sb.c
Simple merge

diff --cc fs/xfs/xfs_super.c
Simple merge