Merge branch 'master' into wrapfs

diff --cc MAINTAINERS
Simple merge

diff --cc fs/Kconfig
Simple merge

diff --cc fs/Makefile
Simple merge

diff --cc fs/read_write.c
Simple merge

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

diff --cc include/uapi/linux/magic.h
Simple merge