• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · f61a657f
    Linus Torvalds authored
    Pull s390 updates from Martin Schwidefsky:
     "The s390 patches for the 4.7 merge window have the usual bug fixes and
      cleanups, and the following new features:
    
       - An interface for dasd driver to query if a volume is online to
         another operating system
    
       - A new ioctl for the dasd driver to verify the format for a range of
         tracks
    
       - Following the example of x86 the struct fpu is now allocated with
         the task_struct
    
       - The 'report_error' interface for the PCI bus to send an
         adapter-error notification from user space to the service element
         of the machine"
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (29 commits)
      s390/vmem: remove unused function parameter
      s390/vmem: fix identity mapping
      s390: add missing include statements
      s390: add missing declarations
      s390: make couple of variables and functions static
      s390/cache: remove superfluous locking
      s390/cpuinfo: simplify locking and skip offline cpus early
      s390/3270: hangup the 3270 tty after a disconnect
      s390/3270: handle reconnect of a tty with a different size
      s390/3270: avoid endless I/O loop with disconnected 3270 terminals
      s390/3270: fix garbled output on 3270 tty view
      s390/3270: fix view reference counting
      s390/3270: add missing tty_kref_put
      s390/dumpstack: implement and use return_address()
      s390/cpum_sf: Remove superfluous SMP function call
      s390/cpum_cf: Remove superfluous SMP function call
      s390/Kconfig: make z196 the default processor type
      s390/sclp: avoid compile warning in sclp_pci_report
      s390/fpu: allocate 'struct fpu' with the task_struct
      s390/crypto: cleanup and move the header with the cpacf definitions
      ...
    f61a657f
kernel-parameters.txt 155 KB