tree 3b1bc7a375af7882cc2ebb7a0b9da997ab5e7e04
parent 4c4fe4c24782bf5bc533b3df34599301ec31b605
parent 1833c9f647e9bda1cd24653ff8f9c207b5f5b911
author Linus Torvalds <torvalds@linux-foundation.org> 1427404277 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1427404277 -0700

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

Pull s390 fixes from Martin Schwidefsky:
 "A couple of bug fixes for s390.

  The ftrace comile fix is quite large for a -rc6 release, but it would
  be nice to have it in 4.0"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/smp: reenable smt after resume
  s390/mm: limit STACK_RND_MASK for compat tasks
  s390/ftrace: fix compile error if CONFIG_KPROBES is disabled
  s390/cpum_sf: add diagnostic sampling event only if it is authorized