From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Oct 2023 18:12:33 +0000 (-0700)
Subject: Merge tag 'integrity-v6.6-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cb84fb87f325ecd46be586b62623db5b2c0a792e;p=linux.git

Merge tag 'integrity-v6.6-fix' of git://git./linux/kernel/git/zohar/linux-integrity

Pull integrity fixes from Mimi Zohar:
 "Two additional patches to fix the removal of the deprecated
  IMA_TRUSTED_KEYRING Kconfig"

* tag 'integrity-v6.6-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
  ima: rework CONFIG_IMA dependency block
  ima: Finish deprecation of IMA_TRUSTED_KEYRING Kconfig
---

cb84fb87f325ecd46be586b62623db5b2c0a792e