Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 56b24d1b
    Linus Torvalds authored
    Pull s390 fixes from Martin Schwidefsky:
    
     - four patches to get the new cputime code in shape for s390
    
     - add the new statx system call
    
     - a few bug fixes
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
      s390: wire up statx system call
      KVM: s390: Fix guest migration for huge guests resulting in panic
      s390/ipl: always use load normal for CCW-type re-IPL
      s390/timex: micro optimization for tod_to_ns
      s390/cputime: provide archicture specific cputime_to_nsecs
      s390/cputime: reset all accounting fields on fork
      s390/cputime: remove last traces of cputime_t
      s390: fix in-kernel program checks
      s390/crypt: fix missing unlock in ctr_paes_crypt on error path
    56b24d1b