Merge branch 'linus' into cpus4096

Conflicts:

	arch/x86/xen/smp.c
	kernel/sched_rt.c
	net/iucv/iucv.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 21 insertions, 0 deletions

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 107e492cb47e..5dc8f8028d52 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -146,6 +146,7 @@ config MATHEMU
 config COMPAT
         bool "Kernel support for 31 bit emulation"
         depends on 64BIT
+        select COMPAT_BINFMT_ELF
         help
           Select this option if you want to enable your system kernel to
           handle system-calls from ELF binaries for 31 bit ESA.  This option
@@ -312,6 +313,10 @@ config ARCH_SPARSEMEM_DEFAULT
 config ARCH_SELECT_MEMORY_MODEL
        def_bool y
 
+config ARCH_ENABLE_MEMORY_HOTPLUG
+        def_bool y
+        depends on SPARSEMEM
+
 source "mm/Kconfig"
 
 comment "I/O subsystem configuration"
@@ -344,6 +349,22 @@ config QDIO_DEBUG
 
           If unsure, say N.
 
+config CHSC_SCH
+        tristate "Support for CHSC subchannels"
+        help
+          This driver allows usage of CHSC subchannels. A CHSC subchannel
+          is usually present on LPAR only.
+          The driver creates a device /dev/chsc, which may be used to
+          obtain I/O configuration information about the machine and
+          to issue asynchronous chsc commands (DANGEROUS).
+          You will usually only want to use this interface on a special
+          LPAR designated for system management.
+
+          To compile this driver as a module, choose M here: the
+          module will be called chsc_sch.
+
+          If unsure, say N.
+
 comment "Misc"
 
 config IPL