linux-next: manual merge of the tip tree with the rr tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in arch/Kconfig
between commit 9a9d5786a5e7 ("Make most arch asm/module.h files use
asm-generic/module.h") from the rr tree and commits fdf9c356502a
("cputime: Make finegrained irqtime accounting generally available") and
2b1d5024e17b ("rcu: Settle config for userspace extended quiescent
state") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/Kconfig
index 3450115,a62965d..0000000
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@@ -281,23 -294,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"

Attachment: pgp00000.pgp
Description: PGP signature