diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-25 19:40:24 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-25 19:40:24 +0300 |
| commit | 301310c6d24e5b135d1efd3d4a9cc6adc4fbd94a (patch) | |
| tree | 819a1ccf187a6b873e6cc2c40a4bde96687b5cc6 /MAINTAINERS | |
| parent | 4ef5b13a294c136c9673a8e04e6afea333c7f755 (diff) | |
| parent | e13cd21ffd50a07b55dcc4d8c38cedf27f28eaa1 (diff) | |
| download | linux-301310c6d24e5b135d1efd3d4a9cc6adc4fbd94a.tar.xz | |
Merge tag 'tpmdd-next-20190925' of git://git.infradead.org/users/jjs/linux-tpmdd
Pull tpm fixes from Jarkko Sakkinen.
* tag 'tpmdd-next-20190925' of git://git.infradead.org/users/jjs/linux-tpmdd:
tpm: Wrap the buffer from the caller to tpm_buf in tpm_send()
MAINTAINERS: keys: Update path to trusted.h
KEYS: trusted: correctly initialize digests and fix locking issue
selftests/tpm2: Add log and *.pyc to .gitignore
selftests/tpm2: Add the missing TEST_FILES assignment
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a8d193a74692..a97f1be63b9d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9056,7 +9056,7 @@ S: Supported F: Documentation/security/keys/trusted-encrypted.rst F: include/keys/trusted-type.h F: security/keys/trusted.c -F: security/keys/trusted.h +F: include/keys/trusted.h KEYS/KEYRINGS: M: David Howells <dhowells@redhat.com> |