diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-29 10:11:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-29 10:11:32 -0700 |
| commit | febf9ee3d2f37a772802fffb6e17c0e35a52e1f1 (patch) | |
| tree | aaec2dc987eddc4de4d0ba6a574621ed8a22830f /security | |
| parent | 86e98ed15b3e34460d1b3095bd119b6fac11841c (diff) | |
| parent | 644f17412f5acf01a19af9d04a921937a2bc86c6 (diff) | |
| download | linux-febf9ee3d2f37a772802fffb6e17c0e35a52e1f1.tar.gz linux-febf9ee3d2f37a772802fffb6e17c0e35a52e1f1.tar.bz2 linux-febf9ee3d2f37a772802fffb6e17c0e35a52e1f1.zip | |
Merge tag 'integrity-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity
Pull integrity update from Mimi Zohar:
"Just one one bug fix. Other integrity changes are being upstreamed via
the tpm and lsm trees"
* tag 'integrity-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
IMA: allow/fix UML builds
Diffstat (limited to 'security')
| -rw-r--r-- | security/integrity/ima/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig index 39caeca47444..60a511c6b583 100644 --- a/security/integrity/ima/Kconfig +++ b/security/integrity/ima/Kconfig @@ -8,7 +8,7 @@ config IMA select CRYPTO_HMAC select CRYPTO_SHA1 select CRYPTO_HASH_INFO - select TCG_TPM if HAS_IOMEM && !UML + select TCG_TPM if HAS_IOMEM select TCG_TIS if TCG_TPM && X86 select TCG_CRB if TCG_TPM && ACPI select TCG_IBMVTPM if TCG_TPM && PPC_PSERIES |