Merge tag 's390-5.4-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Oct 2019 10:35:46 +0000 (06:35 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Oct 2019 10:35:46 +0000 (06:35 -0400)
commitf877bee5ea0b56c39cd0a243e113a577b5a4ef92
tree2efb35dfd80b54cbdffead5f4d4f115da4fbe7a2
parent4fac2407f809e2ccc846bcce1d62ebbf7b0a1cd2
parentac49303d9ef0ad98b79867a380ef23480e48870b
Merge tag 's390-5.4-5' of git://git./linux/kernel/git/s390/linux

Pull s390 fixes from Vasily Gorbik:

 - Add R_390_GLOB_DAT relocation type support. This fixes boot problem
   on linux-next.

 - Fix memory leak in zcrypt

* tag 's390-5.4-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/kaslr: add support for R_390_GLOB_DAT relocation type
  s390/zcrypt: fix memleak at release