diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-24 11:34:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-24 11:34:28 -0700 |
| commit | 1436ab068d6b0309a73849dc239399399621decd (patch) | |
| tree | a9ed8e3cb1a7005b68b46a2300d24b0a9fd4d24d /net/ipv6/fib6_notifier.c | |
| parent | Merge branch 'parisc-4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux (diff) | |
| parent | tpm: ibmvtpm: simplify crq initialization and document crq format (diff) | |
| download | linux-dev-1436ab068d6b0309a73849dc239399399621decd.tar.xz linux-dev-1436ab068d6b0309a73849dc239399399621decd.zip | |
Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull TPM updates from James Morris:
"Here are the TPM updates from Jarkko for v4.14, which I've placed in
their own branch (next-tpm). I ended up cherry-picking them as other
changes had been made in Jarkko's branch after he sent me his original
pull request.
I plan on maintaining a separate branch for TPM (and other security
subsystems) from now on.
From Jarkko: 'Not much this time except a few fixes'"
* 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
tpm: ibmvtpm: simplify crq initialization and document crq format
tpm: replace msleep() with usleep_range() in TPM 1.2/2.0 generic drivers
Documentation: tpm: add powered-while-suspended binding documentation
tpm: tpm_crb: constify acpi_device_id.
tpm: vtpm: constify vio_device_id
Diffstat (limited to 'net/ipv6/fib6_notifier.c')
0 files changed, 0 insertions, 0 deletions