linux-kernel - linux-next: manual merge of the rr tree with the s390 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:	Mon, 6 Aug 2012 11:23:28 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Rusty Russell <rusty@...tcorp.com.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Martin Schwidefsky <schwidefsky@...ibm.com>,
	Heiko Carstens <heiko.carstens@...ibm.com>,
	David Howells <dhowells@...hat.com>
Subject: linux-next: manual merge of the rr tree with the s390 tree

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
arch/s390/Kconfig between commit 867c2dcb369b ("s390/seccomp: add support
for system call filtering using BPF") from the s390 tree and commit
d673c23ca730 ("Make most arch asm/module.h files use
asm-generic/module.h") from the rr tree.

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

diff --cc arch/s390/Kconfig
index 107610e,11cc724..0000000
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -124,7 -123,8 +124,9 @@@ config S39
  	select GENERIC_TIME_VSYSCALL
  	select GENERIC_CLOCKEVENTS
  	select KTIME_SCALAR if 32BIT
 +	select HAVE_ARCH_SECCOMP_FILTER
+ 	select HAVE_MOD_ARCH_SPECIFIC
+ 	select MODULES_USE_ELF_RELA
  
  config SCHED_OMIT_FRAME_POINTER
  	def_bool y

Content of type "application/pgp-signature" skipped