diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-05 11:12:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-05 11:12:33 -0700 |
| commit | cb84fb87f325ecd46be586b62623db5b2c0a792e (patch) | |
| tree | ac485da14932f013b644fb78ffe9be10597bbb30 /include/linux | |
| parent | e90822d7ce017ee11aedf424c8abf38b07c802f0 (diff) | |
| parent | 91e326563ee34509c35267808a4b1b3ea3db62a8 (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
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions