diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-30 10:57:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-30 10:57:32 -0700 |
| commit | 0f751396346f5cfb6d02abe1985af53717b23c3d (patch) | |
| tree | 11ebab51b02a7e142dda9c28197157b7e1fab0e1 /MAINTAINERS | |
| parent | 7111951b8d4973bda27ff663f2cf18b663d15b48 (diff) | |
| parent | 2e356101e72ab1361821b3af024d64877d9a798d (diff) | |
| download | linux-0f751396346f5cfb6d02abe1985af53717b23c3d.tar.bz2 | |
Merge tag 'tpmdd-next-20200316' of git://git.infradead.org/users/jjs/linux-tpmdd
Pull tpm updates from Jarkko Sakkinen:
"tpmdd updates for Linux v5.7"
* tag 'tpmdd-next-20200316' of git://git.infradead.org/users/jjs/linux-tpmdd:
KEYS: reaching the keys quotas correctly
tpm: ibmvtpm: Add support for TPM2
tpm: ibmvtpm: Wait for buffer to be set before proceeding
tpm: of: Handle IBM,vtpm20 case when getting log parameters
MAINTAINERS: adjust to trusted keys subsystem creation
tpm: tpm_tis_spi_cr50: use new structure for SPI transfer delays
tpm_tis_spi: use new 'delay' structure for SPI transfer delays
tpm: tpm2_bios_measurements_next should increase position index
tpm: tpm1_bios_measurements_next should increase position index
tpm: Don't make log failures fatal
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5a5332b3591d..8b6e2d85dd47 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9280,8 +9280,8 @@ L: keyrings@vger.kernel.org S: Supported F: Documentation/security/keys/trusted-encrypted.rst F: include/keys/trusted-type.h -F: security/keys/trusted.c -F: include/keys/trusted.h +F: include/keys/trusted_tpm.h +F: security/keys/trusted-keys/ KEYS/KEYRINGS M: David Howells <dhowells@redhat.com> |