Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · b68e7e95
    Linus Torvalds authored
    Pull s390 updates from Martin Schwidefsky:
    
     - three merges for KVM/s390 with changes for vfio-ccw and cpacf. The
       patches are included in the KVM tree as well, let git sort it out.
    
     - add the new 'trng' random number generator
    
     - provide the secure key verification API for the pkey interface
    
     - introduce the z13 cpu counters to perf
    
     - add a new system call to set up the guarded storage facility
    
     - simplify TASK_SIZE and arch_get_unmapped_area
    
     - export the raw STSI data related to CPU topology to user space
    
     - ... and the usual churn of bug-fixes and cleanups.
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (74 commits)
      s390/crypt: use the correct module alias for paes_s390.
      s390/cpacf: Introduce kma instruction
      s390/cpacf: query instructions use unique parameters for compatibility with KMA
      s390/trng: Introduce s390 TRNG device driver.
      s390/crypto: Provide s390 specific arch random functionality.
      s390/crypto: Add new subfunctions to the cpacf PRNO function.
      s390/crypto: Renaming PPNO to PRNO.
      s390/pageattr: avoid unnecessary page table splitting
      s390/mm: simplify arch_get_unmapped_area[_topdown]
      s390/mm: make TASK_SIZE independent from the number of page table levels
      s390/gs: add regset for the guarded storage broadcast control block
      s390/kvm: Add use_cmma field to mm_context_t
      s390/kvm: Add PGSTE manipulation functions
      vfio: ccw: improve error handling for vfio_ccw_mdev_remove
      vfio: ccw: remove unnecessary NULL checks of a pointer
      s390/spinlock: remove compare and delay instruction
      s390/spinlock: use atomic primitives for spinlocks
      s390/cpumf: simplify detection of guest samples
      s390/pci: remove forward declaration
      s390/pci: increase the PCI_NR_FUNCTIONS default
      ...
    b68e7e95