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

diff --combined drivers/watchdog/Kconfig
index c845527b503a2e3ae0418bbc1600b724c78507a3,ac1f1def1f1171d15e6a96ebad068c9ca69f8f18..76dd54122f76282af7dc5d259f637aa5f327c2e8
--- 1/drivers/watchdog/Kconfig
--- 2/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@@ -272,7 -272,7 +272,7 @@@ config PNX4008_WATCHDO
  
  config IOP_WATCHDOG
        tristate "IOP Watchdog"
 -      depends on PLAT_IOP
 +      depends on ARCH_IOP13XX
        select WATCHDOG_NOWAYOUT if (ARCH_IOP32X || ARCH_IOP33X)
        help
          Say Y here if to include support for the watchdog timer
@@@ -378,8 -378,6 +378,8 @@@ config MAX63XX_WATCHDO
  config IMX2_WDT
        tristate "IMX2+ Watchdog"
        depends on ARCH_MXC
 +      select REGMAP_MMIO
 +      select WATCHDOG_CORE
        help
          This is the driver for the hardware watchdog
          on the Freescale IMX2 and later processors.
@@@ -665,19 -663,6 +665,19 @@@ config INTEL_SCU_WATCHDO
  
          To compile this driver as a module, choose M here.
  
 +config INTEL_MID_WATCHDOG
 +      tristate "Intel MID Watchdog Timer"
 +      depends on X86_INTEL_MID
 +      select WATCHDOG_CORE
 +      ---help---
 +        Watchdog timer driver built into the Intel SCU for Intel MID
 +        Platforms.
 +
 +        This driver currently supports only the watchdog evolution
 +        implementation in SCU, available for Merrifield generation.
 +
 +        To compile this driver as a module, choose M here.
 +
  config ITCO_WDT
        tristate "Intel TCO Timer/Watchdog"
        depends on (X86 || IA64) && PCI
@@@ -850,7 -835,7 +850,7 @@@ config 60XX_WD
  
  config SBC8360_WDT
        tristate "SBC8360 Watchdog Timer"
 -      depends on X86
 +      depends on X86_32
        ---help---
  
          This is the driver for the hardware watchdog on the SBC8360 Single
@@@ -953,6 -938,36 +953,6 @@@ config W83627HF_WD
  
          Most people will say N.
  
 -config W83697HF_WDT
 -      tristate "W83697HF/W83697HG Watchdog Timer"
 -      depends on X86
 -      ---help---
 -        This is the driver for the hardware watchdog on the W83697HF/HG
 -        chipset as used in Dedibox/VIA motherboards (and likely others).
 -        This watchdog simply watches your kernel to make sure it doesn't
 -        freeze, and if it does, it reboots your computer after a certain
 -        amount of time.
 -
 -        To compile this driver as a module, choose M here: the
 -        module will be called w83697hf_wdt.
 -
 -        Most people will say N.
 -
 -config W83697UG_WDT
 -      tristate "W83697UG/W83697UF Watchdog Timer"
 -      depends on X86
 -      ---help---
 -        This is the driver for the hardware watchdog on the W83697UG/UF
 -        chipset as used in MSI Fuzzy CX700 VIA motherboards (and likely others).
 -        This watchdog simply watches your kernel to make sure it doesn't
 -        freeze, and if it does, it reboots your computer after a certain
 -        amount of time.
 -
 -        To compile this driver as a module, choose M here: the
 -        module will be called w83697ug_wdt.
 -
 -        Most people will say N.
 -
  config W83877F_WDT
        tristate "W83877F (EMACS) Watchdog Timer"
        depends on X86
@@@ -1280,14 -1295,17 +1280,17 @@@ config WATCHDOG_RTA
  
  # S390 Architecture
  
- config ZVM_WATCHDOG
-       tristate "z/VM Watchdog Timer"
+ config DIAG288_WATCHDOG
+       tristate "System z diag288 Watchdog"
        depends on S390
+       select WATCHDOG_CORE
        help
          IBM s/390 and zSeries machines running under z/VM 5.1 or later
          provide a virtual watchdog timer to their guest that cause a
          user define Control Program command to be executed after a
          timeout.
+         LPAR provides a very similar interface. This driver handles
+         both.
  
          To compile this driver as a module, choose M here. The module
          will be called vmwatchdog.

diff --combined drivers/watchdog/Makefile
index 7b8a91ed20e749b9e102bd78ad41ff64e7a86442,5a7fb1f611c5be35e048a4d1e30787d5e694807e..468c3204c3b190b7be20616d02d25ba947408581
--- 1/drivers/watchdog/Makefile
--- 2/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@@ -107,12 -107,13 +107,12 @@@ obj-$(CONFIG_SMSC_SCH311X_WDT) += sch31
  obj-$(CONFIG_SMSC37B787_WDT) += smsc37b787_wdt.o
  obj-$(CONFIG_VIA_WDT) += via_wdt.o
  obj-$(CONFIG_W83627HF_WDT) += w83627hf_wdt.o
 -obj-$(CONFIG_W83697HF_WDT) += w83697hf_wdt.o
 -obj-$(CONFIG_W83697UG_WDT) += w83697ug_wdt.o
  obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o
  obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
  obj-$(CONFIG_MACHZ_WDT) += machzwd.o
  obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
  obj-$(CONFIG_INTEL_SCU_WATCHDOG) += intel_scu_watchdog.o
 +obj-$(CONFIG_INTEL_MID_WATCHDOG) += intel-mid_wdt.o
  
  # M32R Architecture
  
@@@ -153,6 -154,7 +153,7 @@@ obj-$(CONFIG_MEN_A21_WDT) += mena21_wdt
  obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
  
  # S390 Architecture
+ obj-$(CONFIG_DIAG288_WATCHDOG) += diag288_wdt.o
  
  # SUPERH (sh + sh64) Architecture
  obj-$(CONFIG_SH_WDT) += shwdt.o