From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 26 Jun 2017 18:58:21 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v4.14-rc1~677
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d646c97e1abf777cf229031365860e7bc1c588c;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'for-linus' of git://git./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
---

9d646c97e1abf777cf229031365860e7bc1c588c