diff options
author | 2025-03-28 12:42:53 -0700 | |
---|---|---|
committer | 2025-03-28 12:42:53 -0700 | |
commit | 15cb9a2b66fc623843c68bd508e2731782ae6570 (patch) | |
tree | ac5d3536b0239c9b9b0f4003d571d0dfb4616a3a /MAINTAINERS | |
parent | Merge tag 'crc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux (diff) | |
parent | tpm: Make chip->{status,cancel,req_canceled} opt (diff) | |
download | wireguard-linux-15cb9a2b66fc623843c68bd508e2731782ae6570.tar.xz wireguard-linux-15cb9a2b66fc623843c68bd508e2731782ae6570.zip |
Merge tag 'tpmdd-next-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd
Pull tpm updates from Jarkko Sakkinen:
"This contains a new driver: a TPM FF-A driver.
FF comes from Firmware Framework, and A comes from Arm's A-profile.
FF-A is essentially a standard mechanism to communicate with TrustZone
apps such as TPM.
Other than that, this includes a pile of fixes and small improvments"
* tag 'tpmdd-next-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
tpm: Make chip->{status,cancel,req_canceled} opt
MAINTAINERS: TPM DEVICE DRIVER: add missing includes
tpm: End any active auth session before shutdown
Documentation: tpm: Add documentation for the CRB FF-A interface
tpm_crb: Add support for the ARM FF-A start method
ACPICA: Add start method for ARM FF-A
tpm_crb: Clean-up and refactor check for idle support
tpm_crb: ffa_tpm: Implement driver compliant to CRB over FF-A
tpm/tpm_ftpm_tee: fix struct ftpm_tee_private documentation
tpm, tpm_tis: Workaround failed command reception on Infineon devices
tpm, tpm_tis: Fix timeout handling when waiting for TPM status
tpm: Convert warn to dbg in tpm2_start_auth_session()
tpm: Lazily flush auth session when getting random data
tpm: ftpm_tee: remove incorrect of_match_ptr annotation
tpm: do not start chip while suspended
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0959fb8b5740..7ebde7c59321 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -24187,6 +24187,8 @@ Q: https://patchwork.kernel.org/project/linux-integrity/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git F: Documentation/devicetree/bindings/tpm/ F: drivers/char/tpm/ +F: include/linux/tpm*.h +F: include/uapi/linux/vtpm_proxy.h F: tools/testing/selftests/tpm2/ TPS546D24 DRIVER |