Merge remote-tracking branch 'block/for-next'

diff --cc block/genhd.c
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/ext4/namei.c
Simple merge

diff --cc fs/gfs2/quota.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc include/linux/genhd.h
Simple merge