Merge remote-tracking branch 'selinux/next'

diff --cc fs/overlayfs/copy_up.c
Simple merge

diff --cc fs/overlayfs/dir.c
Simple merge

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

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