Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a8e9c80 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 patches from Martin Schwidefsky:
 "A couple of bug fixes, a debug change for qdio, an update for the
  default config, and one small extension.

  The watchdog module based on diagnose 0x288 is converted to the
  watchdog API and it now works under LPAR as well"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/ccwgroup: use ccwgroup_ungroup wrapper
  s390/ccwgroup: fix an uninitialized return code
  s390/ccwgroup: obtain extra reference for asynchronous processing
  qdio: Keep device-specific dbf entries
  s390/compat: correct ucontext layout for high gprs
  s390/cio: set device name as early as possible
  s390: update default configuration
  s390: avoid format strings leaking into names
  s390/airq: silence lockdep warning
  s390/watchdog: add support for LPAR operation (diag288)
  s390/watchdog: use watchdog API
  s390/sclp_vt220: Enable ASCII console per default
  s390/qdio: replace shift loop by ilog2
  s390/cio: silence lockdep warning
  s390/uaccess: always load the kernel ASCE after task switch
  s390/ap_bus: Make modules parameters visible in sysfs
parents f1b35b83 fa73eb47

arch/s390/configs/default_defconfig

+3 −2
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ CONFIG_SOLARIS_X86_PARTITION=y 
CONFIG_UNIXWARE_DISKLABEL=y

CONFIG_CFQ_GROUP_IOSCHED=y

CONFIG_DEFAULT_DEADLINE=y

CONFIG_MARCH_Z9_109=y

CONFIG_MARCH_Z196=y

CONFIG_TUNE_ZEC12=y

CONFIG_NR_CPUS=256

CONFIG_PREEMPT=y

CONFIG_HZ_100=y
@@ -240,7 +241,6 @@ CONFIG_IP_VS_PE_SIP=m 
CONFIG_NF_CONNTRACK_IPV4=m

# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set

CONFIG_NF_TABLES_IPV4=m

CONFIG_NFT_REJECT_IPV4=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_NF_TABLES_ARP=m
@@ -456,6 +456,7 @@ CONFIG_TN3270_FS=y 
CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_SOFT_WATCHDOG=m

CONFIG_DIAG288_WATCHDOG=m

# CONFIG_HID is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_INFINIBAND=m

arch/s390/configs/gcov_defconfig

+3 −2
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ CONFIG_SOLARIS_X86_PARTITION=y 
CONFIG_UNIXWARE_DISKLABEL=y

CONFIG_CFQ_GROUP_IOSCHED=y

CONFIG_DEFAULT_DEADLINE=y

CONFIG_MARCH_Z9_109=y

CONFIG_MARCH_Z196=y

CONFIG_TUNE_ZEC12=y

CONFIG_NR_CPUS=256

CONFIG_HZ_100=y

CONFIG_MEMORY_HOTPLUG=y
@@ -238,7 +239,6 @@ CONFIG_IP_VS_PE_SIP=m 
CONFIG_NF_CONNTRACK_IPV4=m

# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set

CONFIG_NF_TABLES_IPV4=m

CONFIG_NFT_REJECT_IPV4=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_NF_TABLES_ARP=m
@@ -453,6 +453,7 @@ CONFIG_TN3270_FS=y 
CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_SOFT_WATCHDOG=m

CONFIG_DIAG288_WATCHDOG=m

# CONFIG_HID is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_INFINIBAND=m

arch/s390/configs/performance_defconfig

+3 −2
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ CONFIG_SOLARIS_X86_PARTITION=y 
CONFIG_UNIXWARE_DISKLABEL=y

CONFIG_CFQ_GROUP_IOSCHED=y

CONFIG_DEFAULT_DEADLINE=y

CONFIG_MARCH_Z9_109=y

CONFIG_MARCH_Z196=y

CONFIG_TUNE_ZEC12=y

CONFIG_NR_CPUS=256

CONFIG_HZ_100=y

CONFIG_MEMORY_HOTPLUG=y
@@ -236,7 +237,6 @@ CONFIG_IP_VS_PE_SIP=m 
CONFIG_NF_CONNTRACK_IPV4=m

# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set

CONFIG_NF_TABLES_IPV4=m

CONFIG_NFT_REJECT_IPV4=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_NF_TABLES_ARP=m
@@ -451,6 +451,7 @@ CONFIG_TN3270_FS=y 
CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_SOFT_WATCHDOG=m

CONFIG_DIAG288_WATCHDOG=m

# CONFIG_HID is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_INFINIBAND=m

arch/s390/configs/zfcpdump_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
CONFIG_PARTITION_ADVANCED=y

CONFIG_IBM_PARTITION=y

CONFIG_DEFAULT_DEADLINE=y

CONFIG_MARCH_Z9_109=y

CONFIG_MARCH_Z196=y

CONFIG_TUNE_ZEC12=y

# CONFIG_COMPAT is not set

CONFIG_NR_CPUS=2

# CONFIG_HOTPLUG_CPU is not set

arch/s390/defconfig

+7 −1
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ CONFIG_PROVE_LOCKING=y 
CONFIG_LOCK_STAT=y

CONFIG_DEBUG_LOCKDEP=y

CONFIG_DEBUG_ATOMIC_SLEEP=y

CONFIG_DEBUG_WRITECOUNT=y

CONFIG_DEBUG_LIST=y

CONFIG_DEBUG_PI_LIST=y

CONFIG_DEBUG_SG=y

CONFIG_DEBUG_NOTIFIERS=y

CONFIG_PROVE_RCU=y
@@ -199,4 +199,10 @@ CONFIG_CRYPTO_SHA512_S390=m 
CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRC7=m

# CONFIG_XZ_DEC_X86 is not set

# CONFIG_XZ_DEC_POWERPC is not set

# CONFIG_XZ_DEC_IA64 is not set

# CONFIG_XZ_DEC_ARM is not set

# CONFIG_XZ_DEC_ARMTHUMB is not set

# CONFIG_XZ_DEC_SPARC is not set

CONFIG_CMM=m