]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Apr 2020 21:49:46 +0000 (14:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Apr 2020 21:49:46 +0000 (14:49 -0700)
commit6b12d66628b273a062df03406c331384ea7aec30
treed4be6632e7c8d599815a0944686b96d7bb215c20
parent31df2ce351a6863dea1849583183300507d99f26
parent843ed45bb682250ea64156b46a31a72e4e7fc4ba
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
arch/powerpc/Kconfig
arch/x86/Kconfig
arch/x86/kernel/Makefile