Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/modules...

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

diff --cc kernel/module/Kconfig
Simple merge

diff --cc kernel/module/internal.h
Simple merge

diff --cc kernel/module/main.c
Simple merge