From: Linus Torvalds Date: Mon, 30 Mar 2020 17:57:32 +0000 (-0700) Subject: Merge tag 'tpmdd-next-20200316' of git://git.infradead.org/users/jjs/linux-tpmdd X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0f751396346f5cfb6d02abe1985af53717b23c3d;p=linux.git 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 --- 0f751396346f5cfb6d02abe1985af53717b23c3d