From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 2 Nov 2019 18:00:26 +0000 (-0700)
Subject: Merge tag 's390-5.4-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v5.4-rc6~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=969a5197da89454c41d95e2404e2e9d91ad73ba6;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 's390-5.4-6' of git://git./linux/kernel/git/s390/linux

Pull s390 fixes from Vasily Gorbik:

 - Fix cpu idle time accounting

 - Fix stack unwinder case when both pt_regs and sp are specified

 - Fix information leak via cmm timeout proc handler

* tag 's390-5.4-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/idle: fix cpu idle time calculation
  s390/unwind: fix mixing regs and sp
  s390/cmm: fix information leak in cmm_timeout_handler()
---

969a5197da89454c41d95e2404e2e9d91ad73ba6