Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · becdce1c
    Linus Torvalds authored
    Pull s390 updates from Martin Schwidefsky:
    
     - Improvements for the spectre defense:
        * The spectre related code is consolidated to a single file
          nospec-branch.c
        * Automatic enable/disable for the spectre v2 defenses (expoline vs.
          nobp)
        * Syslog messages for specve v2 are added
        * Enable CONFIG_GENERIC_CPU_VULNERABILITIES and define the attribute
          functions for spectre v1 and v2
    
     - Add helper macros for assembler alternatives and use them to shorten
       the code in entry.S.
    
     - Add support for persistent configuration data via the SCLP Store Data
       interface. The H/W interface requires a page table that uses 4K pages
       only, the code to setup such an address space is added as well.
    
     - Enable virtio GPU emulation in QEMU. To do this the depends
       statements for a few common Kconfig options are modified.
    
     - Add support for format-3 channel path descriptors and add a binary
       sysfs interface to export the associated utility strings.
    
     - Add a sysfs attribute to control the IFCC handling in case of
       constant channel errors.
    
     - The vfio-ccw changes from Cornelia.
    
     - Bug fixes and cleanups.
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (40 commits)
      s390/kvm: improve stack frame constants in entry.S
      s390/lpp: use assembler alternatives for the LPP instruction
      s390/entry.S: use assembler alternatives
      s390: add assembler macros for CPU alternatives
      s390: add sysfs attributes for spectre
      s390: report spectre mitigation via syslog
      s390: add automatic detection of the spectre defense
      s390: move nobp parameter functions to nospec-branch.c
      s390/cio: add util_string sysfs attribute
      s390/chsc: query utility strings via fmt3 channel path descriptor
      s390/cio: rename struct channel_path_desc
      s390/cio: fix unbind of io_subchannel_driver
      s390/qdio: split up CCQ handling for EQBS / SQBS
      s390/qdio: don't retry EQBS after CCQ 96
      s390/qdio: restrict buffer merging to eligible devices
      s390/qdio: don't merge ERROR output buffers
      s390/qdio: simplify math in get_*_buffer_frontier()
      s390/decompressor: trim uncompressed image head during the build
      s390/crypto: Fix kernel crash on aes_s390 module remove.
      s390/defkeymap: fix global init to zero
      ...
    becdce1c