From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Apr 2017 19:20:30 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: Ubuntu-4.11.0-0.5~230
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=db5dc4996414d61162c9c83bf73e0e2bf2636911;p=mirror_ubuntu-artful-kernel.git

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

Pull s390 fix from Martin Schwidefsky:
 "There is one more fix I would like to see in 4.11: The combination of
  KVM, CMMA and heavy paging can cause data corruption, the fix is to
  clear the _PAGE_UNUSED bit in set_pte_at()"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/mm: fix CMMA vs KSM vs others
---

db5dc4996414d61162c9c83bf73e0e2bf2636911