tree 9d3f5e32f77662ead3b53f43ac43199f1ec6dcd7
parent 97d6e2b636c6e07b99965f3db9f20950d7de2ecc
parent cad49cfc44a5160e3fa09b18e4e7f7cacd13f27d
author Linus Torvalds <torvalds@linux-foundation.org> 1436991164 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1436991164 -0700

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

Pull s390 fixes from Martin Schwidefsky:
 "One improvement for the zcrypt driver, the quality attribute for the
  hwrng device has been missing.  Without it the kernel entropy seeding
  will not happen automatically.

  And six bug fixes, the most important one is the fix for the vector
  register corruption due to machine checks"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/nmi: fix vector register corruption
  s390/process: fix sfpc inline assembly
  s390/dasd: fix kernel panic when alias is set offline
  s390/sclp: clear upper register halves in _sclp_print_early
  s390/oprofile: fix compile error
  s390/sclp: fix compile error
  s390/zcrypt: enable s390 hwrng to seed kernel entropy