Merge branches 'vfsmount-guts', 'umode_t' and 'partitions' into Z

diff --cc block/genhd.c
Simple merge

diff --cc drivers/s390/block/dasd.c
Simple merge

diff --cc fs/Makefile
Simple merge

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

diff --cc fs/internal.h
Simple merge

diff --cc fs/namei.c
Simple merge

diff --cc fs/proc/base.c
Simple merge

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