Merge branch 'tpmdd-fixes' into tpmdd-for-next

diff --cc MAINTAINERS
Simple merge

diff --cc security/keys/trusted-keys/trusted_tpm2.c
index d225ad140960a2df104b102c80549c3e437b49df,c87c4df8703d4ea9426cebab43846ed69fb04ddd..617fabd4d913b81caa5e0537e12477671dbe3a77
--- 1/security/keys/trusted-keys/trusted_tpm2.c
--- 2/security/keys/trusted-keys/trusted_tpm2.c
+++ b/security/keys/trusted-keys/trusted_tpm2.c
@@@ -245,10 -79,7 +245,10 @@@ int tpm2_seal_trusted(struct tpm_chip *
        if (i == ARRAY_SIZE(tpm2_hash_map))
                return -EINVAL;
  
-       rc = tpm_buf_init(&buf, TPM2_ST_SESSIONS, TPM2_CC_CREATE);
 +      if (!options->keyhandle)
 +              return -EINVAL;
 +
+       rc = tpm_try_get_ops(chip);
        if (rc)
                return rc;