Merge branch 'next' into for-linus

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

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

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

diff --cc kernel/kmod.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc security/keys/user_defined.c
Simple merge