tree 25a0f2700c0ffeae5b99a43b71bf84172c48a2c0
parent c0bc126f97fb929b3ae02c1c62322645d70eb408
parent 4130b28f568688f79539b732797a1dc04b048442
author Linus Torvalds <torvalds@linux-foundation.org> 1498503501 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1498503501 -0700

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

Pull s390 bugfix from Martin Schwidefsky:
 "One last s390 patch for 4.12

  Revert the re-IPL semantics back to the v4.7 state. It turned out that
  the memory layout may change due to memory hotplug if load-normal is
  used"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/ipl: revert Load Normal semantics for LPAR CCW-type re-IPL