tree 888f40d5c2b77f3d839a14f9781e418b9d48c22a
parent 5a45a5a881aeb82ce31dd1886afe04146965df23
parent 8bd49ac86677ca43d64f08c45864e438283d6a76
author Linus Torvalds <torvalds@linux-foundation.org> 1489353745 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1489353745 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

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