From: Linus Torvalds Date: Tue, 13 Aug 2019 18:46:24 +0000 (-0700) Subject: Merge tag 'tpmdd-next-20190813' of git://git.infradead.org/users/jjs/linux-tpmdd X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ee1c7bd33e66376067fd6306b730789ee2ae53e4;p=linux.git Merge tag 'tpmdd-next-20190813' of git://git.infradead.org/users/jjs/linux-tpmdd Pull tpm fixes from Jarkko Sakkinen: "One more bug fix for the next release" * tag 'tpmdd-next-20190813' of git://git.infradead.org/users/jjs/linux-tpmdd: KEYS: trusted: allow module init if TPM is inactive or deactivated --- ee1c7bd33e66376067fd6306b730789ee2ae53e4