• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 7a8e9c80
    Linus Torvalds authored
    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
    7a8e9c80
Makefile 5.91 KB