Merge branch 'master' into next

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

diff --cc security/selinux/ss/services.c
Simple merge

diff --cc security/tomoyo/file.c
Simple merge