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

Conflicts:
	Makefile
	arch/Kconfig
	arch/x86/Kconfig
	arch/x86/um/Kconfig
	arch/xtensa/Kconfig

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc Makefile
index 5d8e7f2583881bcbc8b549dc9e2d3d246498865a,e70ebfee9c80ca122f8b9582998e9f241ed66367..2d3daf7c1211574e96ed324a7fab223f72739a58
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -996,8 -993,12 +996,11 @@@ CLEAN_DIRS  += $(MODVERDIR
  # Directories & files removed with 'make mrproper'
  MRPROPER_DIRS  += include/config usr/include include/generated          \
                    arch/*/include/generated
 -MRPROPER_FILES += .config .config.old .version .old_version             \
 -                  include/linux/version.h                               \
 +MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
-                 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
+                 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
+                 signing_key.priv signing_key.x509 x509.genkey         \
+                 extra_certificates signing_key.x509.keyid             \
+                 signing_key.x509.signer
  
  # clean - Delete most, but leave enough to build external modules
  #

diff --cc arch/Kconfig
index a62965d057f6d8b5a94baf8bf14ecc11ecef5491,3450115c64373da128ba7be90de61b8fd7d8f160..8ee5ccf234e31b78c9c17ee060421240c0a6f8be
--- 1/arch/Kconfig
--- 2/arch/Kconfig
+++ b/arch/Kconfig
@@@ -294,23 -281,23 +294,42 @@@ config SECCOMP_FILTE
  
          See Documentation/prctl/seccomp_filter.txt for details.
  
+ config HAVE_MOD_ARCH_SPECIFIC
+       bool
+       help
+         The arch uses struct mod_arch_specific to store data.  Many arches
+         just need a simple module loader without arch specific data - those
+         should not enable this.
+ 
+ config MODULES_USE_ELF_RELA
+       bool
+       help
+         Modules only use ELF RELA relocations.  Modules with ELF REL
+         relocations will give an error.
+ 
+ config MODULES_USE_ELF_REL
+       bool
+       help
+         Modules only use ELF REL relocations.  Modules with ELF RELA
+         relocations will give an error.
+ 
 +config HAVE_RCU_USER_QS
 +      bool
 +      help
 +        Provide kernel entry/exit hooks necessary for userspace
 +        RCU extended quiescent state. Syscalls need to be wrapped inside
 +        rcu_user_exit()-rcu_user_enter() through the slow path using
 +        TIF_NOHZ flag. Exceptions handlers must be wrapped as well. Irqs
 +        are already protected inside rcu_irq_enter/rcu_irq_exit() but
 +        preemption or signal handling on irq exit still need to be protected.
 +
 +config HAVE_VIRT_CPU_ACCOUNTING
 +      bool
 +
 +config HAVE_IRQ_TIME_ACCOUNTING
 +      bool
 +      help
 +        Archs need to ensure they use a high enough resolution clock to
 +        support irq time accounting and then call enable_sched_clock_irqtime().
 +
  source "kernel/gcov/Kconfig"

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/cris/Kconfig
Simple merge

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/kernel/Makefile
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/tile/Kconfig
Simple merge

diff --cc arch/unicore32/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
index 7f9a395c52548e021253dbe78511427700f05fb2,01726cbcc73bd23a7d318201247e2b1b8c909648..061b8eb2efa046e5b281f7f6997971b9b633ed19
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -102,12 -97,11 +102,14 @@@ config X8
        select KTIME_SCALAR if X86_32
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
+       select MODULES_USE_ELF_REL if X86_32
+       select MODULES_USE_ELF_RELA if X86_64
 +      select HAVE_RCU_USER_QS if X86_64
 +      select HAVE_IRQ_TIME_ACCOUNTING
  
  config INSTRUCTION_DECODER
 -      def_bool (KPROBES || PERF_EVENTS || UPROBES)
 +      def_bool y
 +      depends on KPROBES || PERF_EVENTS || UPROBES
  
  config OUTPUT_FORMAT
        string

diff --cc arch/x86/um/Kconfig
index aeaff8bef2f162642ef4ad31603a301384f4b1fe,a4b0c10c9d5d571673db4278f67c86eeb30cc094..35f462a6512b2977717a210211f02e09aa0baa4b
--- 1/arch/x86/um/Kconfig
--- 2/arch/x86/um/Kconfig
+++ b/arch/x86/um/Kconfig
@@@ -21,7 -21,7 +21,8 @@@ config 64BI
  config X86_32
        def_bool !64BIT
        select HAVE_AOUT
 +      select ARCH_WANT_IPC_PARSE_VERSION
+       select MODULES_USE_ELF_REL
  
  config X86_64
        def_bool 64BIT

diff --cc crypto/Kconfig
Simple merge

diff --cc crypto/Makefile
Simple merge

diff --cc fs/cifs/cifsacl.c
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/Makefile
Simple merge

diff --cc net/dns_resolver/dns_key.c
Simple merge

diff --cc net/rxrpc/ar-key.c
Simple merge

diff --cc scripts/Makefile.modpost
Simple merge

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

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

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

diff --cc security/keys/trusted.c
index 3f163d0489ad2e8705a8f57c4751038b9d7d6f36,42036c7a08560d7f2b9d2cdf7197784a1cd1ec9f..e13fcf7636f7ffa0ff40d7cd60408645621dab1f
--- 1/security/keys/trusted.c
--- 2/security/keys/trusted.c
+++ b/security/keys/trusted.c
@@@ -903,9 -936,8 +904,9 @@@ static int trusted_instantiate(struct k
        char *datablob;
        int ret = 0;
        int key_cmd;
 +      size_t key_len;
  
-       if (datalen <= 0 || datalen > 32767 || !data)
+       if (datalen <= 0 || datalen > 32767 || !prep->data)
                return -EINVAL;
  
        datablob = kmalloc(datalen + 1, GFP_KERNEL);