Hi Paul,

Today's linux-next merge of the rcu tree got a conflict in arch/Kconfig
arch/x86/Kconfig between commit d673c23ca730 ("Make most arch
asm/module.h files use asm-generic/module.h") from the rr tree and commits
3dbdfc26e27f ("rcu: Settle config for userspace extended quiescent
state") and 1ea856be75ce ("x86: Exit RCU extended QS on notify resume")
from the rcu tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/Kconfig
index 3450115,1c7c9be..0000000

--- a/arch/Kconfig
+++ b/arch/Kconfig

@@@ -281,23 -274,14 +281,33 @@@ 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.
+ 
  source "kernel/gcov/Kconfig"
diff --cc arch/x86/Kconfig
index a00d899,38dfcc2..0000000

--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig

@@@ -97,8 -95,7 +97,9 @@@ 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
  
  config INSTRUCTION_DECODER
  	def_bool (KPROBES || PERF_EVENTS || UPROBES)