tree 54f3bdfdb74dc55a8165d0e46bff0ae65ebea123
parent 94521ca3dfa6efd4ceb4f6746bf8ead58afb1490
parent 1af135a1e70ee6e31b5c265c769448984d221cf2
author Linus Torvalds <torvalds@linux-foundation.org> 1435725854 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1435725854 -0700

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

Pull more s390 updates from Martin Schwidefsky:
 "There is one larger patch for the AP bus code to make it work with the
  longer reset periods of the latest crypto cards.

  A new default configuration, a naming cleanup for SMP and a few fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/kdump: fix compile for !SMP
  s390/kdump: fix nosmt kernel parameter
  s390: new default configuration
  s390/smp: cleanup core vs. cpu in the SCLP interface
  s390/smp: fix sigp cpu detection loop
  s390/zcrypt: Fixed reset and interrupt handling of AP queues
  s390/kdump: fix REGSET_VX_LOW vector register ELF notes
  s390/bpf: Fix backward jumps