From: Linus Torvalds Date: Thu, 22 Apr 2021 20:51:46 +0000 (-0700) Subject: Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/tpmdd X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=90c911ad7445ccec9936763f05fa5db6a3da53be;p=uclinux-h8%2Flinux.git Merge tag 'fixes' of git://git./linux/kernel/git/jejb/tpmdd Pull tpm fix from James Bottomley: "This is an urgent regression fix for a tpm patch set that went in this merge window. It looks like a rebase before the original pull request lost a tpm_try_get_ops() so we have a lock imbalance in our code which is causing oopses. The original patch was correct on the mailing list. I'm sending this in agreement with Mimi (as joint maintainers of trusted keys) because Jarkko is off communing with the Reindeer or whatever it is Finns do when on holiday" * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/tpmdd: KEYS: trusted: Fix TPM reservation for seal/unseal --- 90c911ad7445ccec9936763f05fa5db6a3da53be