diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-09 05:06:43 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-09 05:06:43 +0200 |
| commit | a556810d8e06aa2da8bbe22da3d105eb5a0d0c7d (patch) | |
| tree | 8f494cfd1b64bf6e7e239c61abcc2183ffa7dcac /drivers/net/vrf.c | |
| parent | Merge tag 'xtensa-20190408' of git://github.com/jcmvbkbc/linux-xtensa (diff) | |
| parent | selftests/tpm2: Open tpm dev in unbuffered mode (diff) | |
| download | linux-a556810d8e06aa2da8bbe22da3d105eb5a0d0c7d.tar.xz linux-a556810d8e06aa2da8bbe22da3d105eb5a0d0c7d.zip | |
Merge branch 'fixes-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull TPM fixes from James Morris:
"From Jarkko: These are critical fixes for v5.1. Contains also couple
of new selftests for v5.1 features (partial reads in /dev/tpm0)"
* 'fixes-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
selftests/tpm2: Open tpm dev in unbuffered mode
selftests/tpm2: Extend tests to cover partial reads
KEYS: trusted: fix -Wvarags warning
tpm: Fix the type of the return value in calc_tpm2_event_size()
KEYS: trusted: allow trusted.ko to initialize w/o a TPM
tpm: fix an invalid condition in tpm_common_poll
tpm: turn on TPM on suspend for TPM 1.x
Diffstat (limited to 'drivers/net/vrf.c')
0 files changed, 0 insertions, 0 deletions