From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 31 May 2019 18:08:44 +0000 (-0700)
Subject: Merge branch 'next-fixes-for-5.2-rc' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~6246
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d266b3f5cac09434eb624af202f9a31307b34a88;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'next-fixes-for-5.2-rc' of git://git./linux/kernel/git/zohar/linux-integrity

Pull integrity subsystem fixes from Mimi Zohar:
 "Four bug fixes, none 5.2-specific, all marked for stable.

  The first two are related to the architecture specific IMA policy
  support. The other two patches, one is related to EVM signatures,
  based on additional hash algorithms, and the other is related to
  displaying the IMA policy"

* 'next-fixes-for-5.2-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
  ima: show rules with IMA_INMASK correctly
  evm: check hash algorithm passed to init_desc()
  ima: fix wrong signed policy requirement when not appraising
  x86/ima: Check EFI_RUNTIME_SERVICES before using
---

d266b3f5cac09434eb624af202f9a31307b34a88