Merge remote-tracking branch 'selinux/next'

diff --cc security/selinux/hooks.c
Simple merge

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

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