Merge tag 'integrity-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Nov 2023 16:53:22 +0000 (06:53 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Nov 2023 16:53:22 +0000 (06:53 -1000)
commitca219be012786654d5c802ee892433aaa0016d10
tree027fe9e949f73c9661217adfbf4feaca5b14241c
parent21e80f3841c01aeaf32d7aee7bbc87b3db1aa0c6
parentb836c4d29f2744200b2af41e14bf50758dddc818
Merge tag 'integrity-v6.7' of git://git./linux/kernel/git/zohar/linux-integrity

Pull integrity updates from Mimi Zohar:
 "Four integrity changes: two IMA-overlay updates, an integrity Kconfig
  cleanup, and a secondary keyring update"

* tag 'integrity-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
  ima: detect changes to the backing overlay file
  certs: Only allow certs signed by keys on the builtin keyring
  integrity: fix indentation of config attributes
  ima: annotate iint mutex to avoid lockdep false positive warnings
fs/overlayfs/super.c
security/integrity/Kconfig