tree 4e52bdc8ac508f56747dcf8113ed0e1b66337b46
parent 9a0bb2966efbf30a71c128c3af63307d8b5f5fc0
parent fcf2f402937a6696f6fa2a1aa882c5075e5fac34
author Linus Torvalds <torvalds@linux-foundation.org> 1388695507 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1388695507 -0800

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

Pull s390 fixes from Martin Schwidefsky:
 "Two small bug fixes and a follow-up to the CONFIG_NR_CPUS change.

  A kernel compiled with CONFIG_NR_CPUS=256 will waste quite a bit of
  memory for the per-cpu arrays.  Under z/VM the maximum number of CPUs
  is 64, the code now limits the possible cpu mask to 64 if running
  under z/VM"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/pci: obtain function handle in hotplug notifier
  s390/3270: fix allocation of tty3270_screen structure
  s390/smp: improve setup of possible cpu mask