From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Apr 2020 21:49:46 +0000 (-0700)
Subject: Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar... 
X-Git-Tag: v5.7-rc1~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f218319caaaf6f2a43b22d8c82b898f32b4ec70;p=thirdparty%2Fkernel%2Fstable.git

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

Pull integrity updates from Mimi Zohar:
 "Just a couple of updates for linux-5.7:

   - A new Kconfig option to enable IMA architecture specific runtime
     policy rules needed for secure and/or trusted boot, as requested.

   - Some message cleanup (eg. pr_fmt, additional error messages)"

* 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
  ima: add a new CONFIG for loading arch-specific policies
  integrity: Remove duplicate pr_fmt definitions
  IMA: Add log statements for failure conditions
  IMA: Update KBUILD_MODNAME for IMA files to ima
---

7f218319caaaf6f2a43b22d8c82b898f32b4ec70