linux-kernel - linux-next: manual merge of the tip 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]

Message-Id: <20130207135045.bf4dac00c7f359b70fab7374@canb.auug.org.au>
Date:	Thu, 7 Feb 2013 13:50:45 +1100
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,
	Martin Schwidefsky <schwidefsky@...ibm.com>,
	Heiko Carstens <heiko.carstens@...ibm.com>,
	Frederic Weisbecker <fweisbec@...il.com>
Subject: linux-next: manual merge of the tip tree with the s390 tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/s390/Kconfig between commit ad2c429560fc ("s390/Kconfig: sort list
of arch selected config options") from the s390 tree and commit
6147a9d8070e ("irq_work: Remove CONFIG_HAVE_IRQ_WORK") 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/s390/Kconfig
index 17775cf,c15ba7d..0000000
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -91,56 -128,17 +91,55 @@@ config S39
  	select ARCH_INLINE_WRITE_UNLOCK_BH
  	select ARCH_INLINE_WRITE_UNLOCK_IRQ
  	select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
 -	select HAVE_UID16 if 32BIT
 +	select ARCH_SAVE_PAGE_KEYS if HIBERNATION
  	select ARCH_WANT_IPC_PARSE_VERSION
 -	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT
 +	select BUILDTIME_EXTABLE_SORT
 +	select CLONE_BACKWARDS2
 +	select GENERIC_CLOCKEVENTS
 +	select GENERIC_CPU_DEVICES if !SMP
 +	select GENERIC_KERNEL_THREAD
  	select GENERIC_SMP_IDLE_THREAD
  	select GENERIC_TIME_VSYSCALL_OLD
 -	select GENERIC_CLOCKEVENTS
 -	select KTIME_SCALAR if 32BIT
 +	select HAVE_ALIGNED_STRUCT_PAGE if SLUB
 +	select HAVE_ARCH_JUMP_LABEL if !MARCH_G5
 +	select HAVE_ARCH_MUTEX_CPU_RELAX
  	select HAVE_ARCH_SECCOMP_FILTER
 +	select HAVE_ARCH_TRACEHOOK
 +	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT
 +	select HAVE_BPF_JIT if 64BIT && PACK_STACK
 +	select HAVE_CMPXCHG_DOUBLE
 +	select HAVE_CMPXCHG_LOCAL
 +	select HAVE_C_RECORDMCOUNT
 +	select HAVE_DEBUG_KMEMLEAK
 +	select HAVE_DYNAMIC_FTRACE
 +	select HAVE_FTRACE_MCOUNT_RECORD
 +	select HAVE_FUNCTION_GRAPH_TRACER
 +	select HAVE_FUNCTION_TRACER
 +	select HAVE_FUNCTION_TRACE_MCOUNT_TEST
- 	select HAVE_IRQ_WORK
 +	select HAVE_KERNEL_BZIP2
 +	select HAVE_KERNEL_GZIP
 +	select HAVE_KERNEL_LZMA
 +	select HAVE_KERNEL_LZO
 +	select HAVE_KERNEL_XZ
 +	select HAVE_KPROBES
 +	select HAVE_KRETPROBES
 +	select HAVE_KVM if 64BIT
 +	select HAVE_MEMBLOCK
 +	select HAVE_MEMBLOCK_NODE_MAP
  	select HAVE_MOD_ARCH_SPECIFIC
 +	select HAVE_OPROFILE
 +	select HAVE_PERF_EVENTS
 +	select HAVE_REGS_AND_STACK_ACCESS_API
 +	select HAVE_SYSCALL_TRACEPOINTS
 +	select HAVE_SYSCALL_WRAPPERS
 +	select HAVE_UID16 if 32BIT
 +	select HAVE_VIRT_CPU_ACCOUNTING
 +	select INIT_ALL_POSSIBLE
 +	select KTIME_SCALAR if 32BIT
  	select MODULES_USE_ELF_RELA
 -	select CLONE_BACKWARDS2
 +	select SYSCTL_EXCEPTION_TRACE
 +	select USE_GENERIC_SMP_HELPERS if SMP
 +	select VIRT_CPU_ACCOUNTING
  
  config SCHED_OMIT_FRAME_POINTER
  	def_bool y

Content of type "application/pgp-signature" skipped