Commit febf9ee3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 86e98ed1 644f1741

security/integrity/ima/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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