From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Feb 2020 23:15:16 +0000 (-0800)
Subject: Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar... 
X-Git-Tag: v5.15~4446
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ebe7acadf5a9c4b67475e766e0e80ae6a2a79c61;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'next-integrity' of git://git./linux/kernel/git/zohar/linux-integrity

Pull IMA fixes from Mimi Zohar:
 "Two bug fixes and an associated change for each.

  The one that adds SM3 to the IMA list of supported hash algorithms is
  a simple change, but could be considered a new feature"

* 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
  ima: add sm3 algorithm to hash algorithm configuration list
  crypto: rename sm3-256 to sm3 in hash_algo_name
  efi: Only print errors about failing to get certs if EFI vars are found
  x86/ima: use correct identifier for SetupMode variable
---

ebe7acadf5a9c4b67475e766e0e80ae6a2a79c61