From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Jan 2014 20:45:07 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v5.15~18710
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b479667923464591f44531ab3469ae4a0b2e074d;p=mirror_ubuntu-kernels.git

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
---

b479667923464591f44531ab3469ae4a0b2e074d