From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 18 Jan 2020 20:18:55 +0000 (-0800)
Subject: Merge tag 's390-5.5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2324de6fab2223287da7628ba92dc6cfed4f46ca;p=linux.git

Merge tag 's390-5.5-5' of git://git./linux/kernel/git/s390/linux

Pull s390 fixes from Vasily Gorbik:

 - Fix printing misleading Secure-IPL enabled message when it is not.

 - Fix a race condition between host ap bus and guest ap bus doing
   device reset in crypto code.

 - Fix sanity check in CCA cipher key function (CCA AES cipher key
   support), which fails otherwise.

* tag 's390-5.5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/setup: Fix secure ipl message
  s390/zcrypt: move ap device reset from bus to driver code
  s390/zcrypt: Fix CCA cipher key gen with clear key value function
---

2324de6fab2223287da7628ba92dc6cfed4f46ca