Merge remote-tracking branch 'modules/modules-next'

diff --cc Makefile
Simple merge

diff --cc arch/metag/Kconfig
index b06b41861aaca2fa517f657d92d4ad6a8e572b89,2099617e3ec0de7161dd224002e623848c6c66f9..6f16c14693272e593aa0f98d33e6b62d60f8ce79
--- 1/arch/metag/Kconfig
--- 2/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@@ -25,9 -21,9 +21,10 @@@ config META
        select HAVE_MEMBLOCK
        select HAVE_MEMBLOCK_NODE_MAP
        select HAVE_MOD_ARCH_SPECIFIC
 +      select HAVE_OPROFILE
        select HAVE_PERF_EVENTS
        select HAVE_SYSCALL_TRACEPOINTS
+       select HAVE_UNDERSCORE_SYMBOL_PREFIX
        select IRQ_DOMAIN
        select MODULES_USE_ELF_RELA
        select OF