From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 Oct 2019 10:35:46 +0000 (-0400)
Subject: Merge tag 's390-5.4-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v5.4-rc5~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f877bee5ea0b56c39cd0a243e113a577b5a4ef92;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 's390-5.4-5' of git://git.kernel.org/pub/scm/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
---

f877bee5ea0b56c39cd0a243e113a577b5a4ef92