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

Conflicts:
	Makefile
	arch/Kconfig
	arch/alpha/Kconfig
	arch/arm/Kconfig
	arch/cris/include/asm/Kbuild
	arch/h8300/include/asm/Kbuild
	arch/m32r/include/asm/Kbuild
	arch/s390/Kconfig
	arch/x86/Kconfig
	arch/x86/um/Kconfig
	arch/xtensa/Kconfig
	init/Kconfig
	lib/Makefile

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 26a28419cafcc400afb7300c702687b8d2dc103e,3450115c64373da128ba7be90de61b8fd7d8f160..3d7727a40b449c11bafa9aadb135d93989511f89
--- 1/arch/Kconfig
--- 2/arch/Kconfig
+++ b/arch/Kconfig
@@@ -297,26 -281,23 +297,45 @@@ config SECCOMP_FILTE
  
          See Documentation/prctl/seccomp_filter.txt for details.
  
 +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().
 +
 +config HAVE_ARCH_TRANSPARENT_HUGEPAGE
 +      bool
 +
+ 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.
+ 
  source "kernel/gcov/Kconfig"

diff --cc arch/alpha/Kconfig
index 7da91246e2793c6d8ecf5556ca65530c6c7275c0,7e3710c0cce5a4c2ef51b8a889a061979a0b9b24..6ac8f6e512f6f6a49949bd0378a6d848b8da8ecc
--- 1/arch/alpha/Kconfig
--- 2/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@@ -20,7 -20,8 +20,9 @@@ config ALPH
        select GENERIC_CMOS_UPDATE
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
+       select HAVE_MOD_ARCH_SPECIFIC
+       select MODULES_USE_ELF_RELA
 +      select GENERIC_KERNEL_THREAD
        help
          The Alpha is a 64-bit general-purpose processor designed and
          marketed by the Digital Equipment Corporation of blessed memory,

diff --cc arch/arm/Kconfig
index 767aae8277fa1f107e0384976dfbe2eb42897d06,7a08b3a71c013a2b3cbf9681e637eefdb637ecdf..c2be0c4b5d192037bd395fe768862bd6cefb358e
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -52,7 -49,8 +52,9 @@@ config AR
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
        select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN
+       select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND
+       select MODULES_USE_ELF_REL
 +      select GENERIC_KERNEL_THREAD
        help
          The ARM series is a line of low-power-consumption RISC chip designs
          licensed by ARM Ltd and targeted at embedded applications and

diff --cc arch/blackfin/Kconfig
Simple merge

diff --cc arch/cris/Kconfig
Simple merge

diff --cc arch/cris/include/asm/Kbuild
index ff1bf7fcae8e116d86f23a7c05d825fd4ebc60b5,28b690de797116ca4f5deb292021b75e72924e82..6d43a951b5ec0b5b217ca8a51405cfa274be5ffb
--- 1/arch/cris/include/asm/Kbuild
--- 2/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@@ -8,5 -8,4 +8,6 @@@ header-y += etraxgpio.
  header-y += rs485.h
  header-y += sync_serial.h
  
 +generic-y += clkdev.h
 +generic-y += exec.h
+ generic-y += module.h

diff --cc arch/h8300/Kconfig
Simple merge

diff --cc arch/h8300/include/asm/Kbuild
index fccd81eddff1f6de89b07cc13c362809364c9507,871382d239fef60105b37f50424afe24ed6773e3..3c5ec8dd98711f18a68d2dfb511a7e5ccdb849c0
--- 1/arch/h8300/include/asm/Kbuild
--- 2/arch/h8300/include/asm/Kbuild
+++ b/arch/h8300/include/asm/Kbuild
@@@ -1,4 -1,3 +1,5 @@@
  include include/asm-generic/Kbuild.asm
  
 +generic-y += clkdev.h
 +generic-y += exec.h
+ generic-y     += module.h

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/m32r/Kconfig
Simple merge

diff --cc arch/m32r/include/asm/Kbuild
index fccd81eddff1f6de89b07cc13c362809364c9507,871382d239fef60105b37f50424afe24ed6773e3..3c5ec8dd98711f18a68d2dfb511a7e5ccdb849c0
--- 1/arch/m32r/include/asm/Kbuild
--- 2/arch/m32r/include/asm/Kbuild
+++ b/arch/m32r/include/asm/Kbuild
@@@ -1,4 -1,3 +1,5 @@@
  include include/asm-generic/Kbuild.asm
  
 +generic-y += clkdev.h
 +generic-y += exec.h
+ generic-y     += module.h

diff --cc arch/m68k/Kconfig
Simple merge

diff --cc arch/microblaze/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

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

diff --cc arch/parisc/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/s390/Kconfig
index 99d2d790d1528c256c2fe6c2099fdc0809988382,c76a052f60e29ddd9724d4555fe77d4148c013ef..7066325081268d28c1fd225851921be627fdbf7e
--- 1/arch/s390/Kconfig
--- 2/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -135,7 -125,8 +135,9 @@@ config S39
        select GENERIC_CLOCKEVENTS
        select KTIME_SCALAR if 32BIT
        select HAVE_ARCH_SECCOMP_FILTER
 +      select GENERIC_KERNEL_THREAD
+       select HAVE_MOD_ARCH_SPECIFIC
+       select MODULES_USE_ELF_RELA
  
  config SCHED_OMIT_FRAME_POINTER
        def_bool y

diff --cc arch/score/Kconfig
Simple merge

diff --cc arch/sh/Kconfig
Simple merge

diff --cc arch/sparc/Kconfig
Simple merge

diff --cc arch/sparc/include/asm/Kbuild
Simple merge

diff --cc arch/tile/Kconfig
Simple merge

diff --cc arch/unicore32/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
index 42d2c35a5bbdd61b594ee5e2b9431532ad02a59f,01726cbcc73bd23a7d318201247e2b1b8c909648..382570723ea996ab820d96c80d3ab2a0360613fb
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -106,13 -97,11 +106,15 @@@ config X8
        select KTIME_SCALAR if X86_32
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
 +      select HAVE_RCU_USER_QS if X86_64
 +      select HAVE_IRQ_TIME_ACCOUNTING
 +      select GENERIC_KERNEL_THREAD
+       select MODULES_USE_ELF_REL if X86_32
+       select MODULES_USE_ELF_RELA if X86_64
  
  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 30c4eec033afa7e0a3cab735ac93e9281384af78,a4b0c10c9d5d571673db4278f67c86eeb30cc094..dfe41302079607a3b4215f9f9528cd53a68cda5e
--- 1/arch/x86/um/Kconfig
--- 2/arch/x86/um/Kconfig
+++ b/arch/x86/um/Kconfig
@@@ -22,7 -21,7 +22,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
index 4c93533da42cbd66fd29f84b4e66c8c7e881c9ff,abc6e63f2fb81c715694a3361ba18086418d64b7..c38198128757a6ae920eafb2625f6e7410500a83
--- 1/init/Kconfig
--- 2/init/Kconfig
+++ b/init/Kconfig
@@@ -1589,10 -1672,12 +1649,18 @@@ config PADAT
        depends on SMP
        bool
  
 +# Can be selected by architectures with broken toolchains
 +# that get confused by correct const<->read_only section
 +# mappings
 +config BROKEN_RODATA
 +      bool
 +
+ config ASN1
+       tristate
+       help
+         Build a simple ASN.1 grammar compiler that produces a bytecode output
+         that can be interpreted by the ASN.1 stream decoder and used to
+         inform it as to what tags are to be expected in a stream and what
+         functions to call on what tags.
+ 
  source "kernel/Kconfig.locks"

diff --cc kernel/Makefile
Simple merge

diff --cc lib/Makefile
index 3128e357e28649b58ddc05bf4d0802455a10f8fc,ca856b69a21d7010c263081e01ed01be21be6be1..821a16229111eba69f189ae9be683f02eeb70862
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -140,11 -140,8 +140,13 @@@ $(foreach file, $(libfdt_files), 
        $(eval CFLAGS_$(file) = -I$(src)/../scripts/dtc/libfdt))
  lib-$(CONFIG_LIBFDT) += $(libfdt_files)
  
 +obj-$(CONFIG_RBTREE_TEST) += rbtree_test.o
 +obj-$(CONFIG_INTERVAL_TREE_TEST) += interval_tree_test.o
 +
 +interval_tree_test-objs := interval_tree_test_main.o interval_tree.o
 +
+ obj-$(CONFIG_ASN1) += asn1_decoder.o
+ 
  hostprogs-y   := gen_crc32table
  clean-files   := crc32table.h
  

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);