]> www.infradead.org Git - users/willy/pagecache.git/commit
projects / users / willy / pagecache.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: e90822d 91e3265)
Merge tag 'integrity-v6.6-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Oct 2023 18:12:33 +0000 (11:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Oct 2023 18:12:33 +0000 (11:12 -0700)
commitcb84fb87f325ecd46be586b62623db5b2c0a792e
treeac485da14932f013b644fb78ffe9be10597bbb30tree
parente90822d7ce017ee11aedf424c8abf38b07c802f0commit | diff
parent91e326563ee34509c35267808a4b1b3ea3db62a8commit | diff
Merge tag 'integrity-v6.6-fix' of git://git.kernel.org/pub/scm/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
Unnamed repository; edit this file 'description' to name the repository.