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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Fri, 28 Sep 2012 13:38:16 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Howells <dhowells@...hat.com>,
	Rusty Russell <rusty@...tcorp.com.au>
Subject: linux-next: manual merge of the tip tree with the rr tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/x86/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 edf55fda35c7 ("x86: Exit RCU extended QS on
notify resume") 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@...b.auug.org.au

diff --cc arch/x86/Kconfig
index ede3e92,56e7a25..0000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -97,11 -102,12 +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

Content of type "application/pgp-signature" skipped