From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 Jan 2017 20:25:26 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: MMI-PSA29.97-13-9~6322
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=69978aa0f21f43529e11f924504dadb6ce2f229a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

Pull s390 fixes from Martin Schwidefsky:
 "Another two bug fixes:

   - ptrace partial write information leak

   - a guest page hinting regression introduced with v4.6"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/mm: Fix cmma unused transfer from pgste into pte
  s390/ptrace: Preserve previous registers for short regset write
---

69978aa0f21f43529e11f924504dadb6ce2f229a