Merge branch 'next' into for-linus

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

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

diff --cc kernel/capability.c
Simple merge

diff --cc security/commoncap.c
Simple merge

diff --cc security/security.c
Simple merge

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

diff --cc security/smack/smack_lsm.c
Simple merge